Mercurial > hg > xemacs-beta
comparison src/callint.c @ 563:183866b06e0b
[xemacs-hg @ 2001-05-24 07:50:48 by ben]
Makefile.in.in, abbrev.c, alloc.c, buffer.c, bytecode.c, callint.c, callproc.c, casetab.c, chartab.c, cmdloop.c, cmds.c, console-msw.c, console-msw.h, console-stream.c, console-tty.c, console-x.c, console.c, data.c, database.c, debug.c, device-gtk.c, device-msw.c, device-tty.c, device-x.c, device.c, dialog-gtk.c, dialog-msw.c, dialog-x.c, dialog.c, dired-msw.c, dired.c, doc.c, doprnt.c, dragdrop.c, editfns.c, eldap.c, eldap.h, elhash.c, emacs-widget-accessors.c, emacs.c, emodules.c, esd.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, filelock.c, floatfns.c, fns.c, font-lock.c, frame-gtk.c, frame-x.c, frame.c, general-slots.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gui-gtk.c, gui-x.c, gui.c, gutter.c, hpplay.c, indent.c, input-method-xlib.c, insdel.c, intl.c, keymap.c, libsst.c, libsst.h, linuxplay.c, lisp.h, lread.c, lstream.c, lstream.h, macros.c, marker.c, md5.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, miscplay.c, miscplay.h, mule-ccl.c, mule-charset.c, mule-wnnfns.c, mule.c, nas.c, ntplay.c, ntproc.c, objects-gtk.c, objects-msw.c, objects-x.c, objects.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, ralloc.c, rangetab.c, redisplay.c, scrollbar.c, search.c, select-gtk.c, select-x.c, select.c, sgiplay.c, sheap.c, sound.c, specifier.c, sunplay.c, symbols.c, symeval.h, symsinit.h, syntax.c, sysdep.c, toolbar-msw.c, toolbar.c, tooltalk.c, ui-byhand.c, ui-gtk.c, undo.c, unexaix.c, unexapollo.c, unexconvex.c, unexec.c, widget.c, win32.c, window.c:
-- defsymbol -> DEFSYMBOL.
-- add an error type to all errors.
-- eliminate the error functions in eval.c that let you just
use Qerror as the type.
-- redo the error API to be more consistent, sensibly named,
and easier to use.
-- redo the error hierarchy somewhat. create new errors:
structure-formation-error, gui-error, invalid-constant,
stack-overflow, out-of-memory, process-error, network-error,
sound-error, printing-unreadable-object, base64-conversion-
error; coding-system-error renamed to text-conversion error;
some others.
-- fix Mule problems in error strings in emodules.c, tooltalk.c.
-- fix error handling in mswin open-network-stream.
-- Mule-ize all sound files and clean up the headers.
-- nativesound.h -> sound.h and used for all sound files.
-- move some shared stuff into glyphs-shared.c: first attempt
at eliminating some of the massive GTK code duplication.
xemacs.mak: add glyphs-shared.c.
xemacs-faq.texi: document how to debug X errors
subr.el: fix doc string to reflect reality
author | ben |
---|---|
date | Thu, 24 May 2001 07:51:33 +0000 |
parents | 7039e6323819 |
children | 6e99cc8c6ca5 |
comparison
equal
deleted
inserted
replaced
562:c775bd016b32 | 563:183866b06e0b |
---|---|
252 check_mark (void) | 252 check_mark (void) |
253 { | 253 { |
254 Lisp_Object tem; | 254 Lisp_Object tem; |
255 | 255 |
256 if (zmacs_regions && !zmacs_region_active_p) | 256 if (zmacs_regions && !zmacs_region_active_p) |
257 error ("The region is not active now"); | 257 invalid_operation ("The region is not active now", Qunbound); |
258 | 258 |
259 tem = Fmarker_buffer (current_buffer->mark); | 259 tem = Fmarker_buffer (current_buffer->mark); |
260 if (NILP (tem) || (XBUFFER (tem) != current_buffer)) | 260 if (NILP (tem) || (XBUFFER (tem) != current_buffer)) |
261 error ("The mark is not set now"); | 261 invalid_operation ("The mark is not set now", Qunbound); |
262 | 262 |
263 return marker_position (current_buffer->mark); | 263 return marker_position (current_buffer->mark); |
264 } | 264 } |
265 | 265 |
266 static Lisp_Object | 266 static Lisp_Object |
497 { | 497 { |
498 if (STRINGP (specs)) | 498 if (STRINGP (specs)) |
499 prompt_data = (const char *) XSTRING_DATA (specs); | 499 prompt_data = (const char *) XSTRING_DATA (specs); |
500 | 500 |
501 if (prompt_data[prompt_index] == '+') | 501 if (prompt_data[prompt_index] == '+') |
502 error ("`+' is not used in `interactive' for ordinary commands"); | 502 syntax_error ("`+' is not used in `interactive' for ordinary commands", Qunbound); |
503 else if (prompt_data[prompt_index] == '*') | 503 else if (prompt_data[prompt_index] == '*') |
504 { | 504 { |
505 prompt_index++; | 505 prompt_index++; |
506 if (!NILP (current_buffer->read_only)) | 506 if (!NILP (current_buffer->read_only)) |
507 barf_if_buffer_read_only (current_buffer, -1, -1); | 507 barf_if_buffer_read_only (current_buffer, -1, -1); |
526 if (!NILP (window)) | 526 if (!NILP (window)) |
527 { | 527 { |
528 if (MINI_WINDOW_P (XWINDOW (window)) | 528 if (MINI_WINDOW_P (XWINDOW (window)) |
529 && ! (minibuf_level > 0 && EQ (window, | 529 && ! (minibuf_level > 0 && EQ (window, |
530 minibuf_window))) | 530 minibuf_window))) |
531 error ("Attempt to select inactive minibuffer window"); | 531 invalid_operation ("Attempt to select inactive minibuffer window", Qunbound); |
532 | 532 |
533 #if 0 /* unclean! see event-stream.c */ | 533 #if 0 /* unclean! see event-stream.c */ |
534 /* If the current buffer wants to clean up, let it. */ | 534 /* If the current buffer wants to clean up, let it. */ |
535 if (!NILP (Vmouse_leave_buffer_hook)) | 535 if (!NILP (Vmouse_leave_buffer_hook)) |
536 run_hook (Qmouse_leave_buffer_hook); | 536 run_hook (Qmouse_leave_buffer_hook); |
735 #else | 735 #else |
736 event = Vcurrent_mouse_event; | 736 event = Vcurrent_mouse_event; |
737 #endif | 737 #endif |
738 | 738 |
739 if (NILP (event)) | 739 if (NILP (event)) |
740 error ("%s must be bound to a mouse or misc-user event", | 740 signal_error (Qinvalid_operation, |
741 (SYMBOLP (function) | 741 "function must be bound to a mouse or misc-user event", |
742 ? (char *) string_data (XSYMBOL (function)->name) | 742 function); |
743 : "command")); | |
744 args[argnum] = event; | 743 args[argnum] = event; |
745 mouse_event_count++; | 744 mouse_event_count++; |
746 break; | 745 break; |
747 } | 746 } |
748 case 'D': /* Directory name. */ | 747 case 'D': /* Directory name. */ |
957 /* We have a case for `+' so we get an error | 956 /* We have a case for `+' so we get an error |
958 if anyone tries to define one here. */ | 957 if anyone tries to define one here. */ |
959 case '+': | 958 case '+': |
960 default: | 959 default: |
961 { | 960 { |
962 error ("Invalid `interactive' control letter \"%c\" (#o%03o).", | 961 signal_ferror (Qsyntax_error, |
963 prompt_data[prompt_index], | 962 "Invalid `interactive' control letter \"%c\" (#o%03o).", |
964 prompt_data[prompt_index]); | 963 prompt_data[prompt_index], |
964 prompt_data[prompt_index]); | |
965 } | 965 } |
966 } | 966 } |
967 #undef PROMPT | 967 #undef PROMPT |
968 if (NILP (visargs[argnum])) | 968 if (NILP (visargs[argnum])) |
969 visargs[argnum] = args[argnum]; | 969 visargs[argnum] = args[argnum]; |
1033 } | 1033 } |
1034 | 1034 |
1035 void | 1035 void |
1036 syms_of_callint (void) | 1036 syms_of_callint (void) |
1037 { | 1037 { |
1038 defsymbol (&Qcall_interactively, "call-interactively"); | 1038 DEFSYMBOL (Qcall_interactively); |
1039 defsymbol (&Qread_from_minibuffer, "read-from-minibuffer"); | 1039 DEFSYMBOL (Qread_from_minibuffer); |
1040 defsymbol (&Qcompleting_read, "completing-read"); | 1040 DEFSYMBOL (Qcompleting_read); |
1041 defsymbol (&Qread_file_name, "read-file-name"); | 1041 DEFSYMBOL (Qread_file_name); |
1042 defsymbol (&Qread_directory_name, "read-directory-name"); | 1042 DEFSYMBOL (Qread_directory_name); |
1043 defsymbol (&Qread_string, "read-string"); | 1043 DEFSYMBOL (Qread_string); |
1044 defsymbol (&Qread_buffer, "read-buffer"); | 1044 DEFSYMBOL (Qread_buffer); |
1045 defsymbol (&Qread_variable, "read-variable"); | 1045 DEFSYMBOL (Qread_variable); |
1046 defsymbol (&Qread_function, "read-function"); | 1046 DEFSYMBOL (Qread_function); |
1047 defsymbol (&Qread_command, "read-command"); | 1047 DEFSYMBOL (Qread_command); |
1048 defsymbol (&Qread_number, "read-number"); | 1048 DEFSYMBOL (Qread_number); |
1049 defsymbol (&Qread_expression, "read-expression"); | 1049 DEFSYMBOL (Qread_expression); |
1050 #if defined(MULE) || defined(FILE_CODING) | 1050 #if defined(MULE) || defined(FILE_CODING) |
1051 defsymbol (&Qread_coding_system, "read-coding-system"); | 1051 DEFSYMBOL (Qread_coding_system); |
1052 defsymbol (&Qread_non_nil_coding_system, "read-non-nil-coding-system"); | 1052 DEFSYMBOL (Qread_non_nil_coding_system); |
1053 #endif | 1053 #endif |
1054 defsymbol (&Qevents_to_keys, "events-to-keys"); | 1054 DEFSYMBOL (Qevents_to_keys); |
1055 defsymbol (&Qcommand_debug_status, "command-debug-status"); | 1055 DEFSYMBOL (Qcommand_debug_status); |
1056 defsymbol (&Qenable_recursive_minibuffers, "enable-recursive-minibuffers"); | 1056 DEFSYMBOL (Qenable_recursive_minibuffers); |
1057 | 1057 |
1058 defsymbol (&QletX, "let*"); | 1058 defsymbol (&QletX, "let*"); |
1059 defsymbol (&Qsave_excursion, "save-excursion"); | 1059 DEFSYMBOL (Qsave_excursion); |
1060 #if 0 /* ill-conceived */ | 1060 #if 0 /* ill-conceived */ |
1061 defsymbol (&Qmouse_leave_buffer_hook, "mouse-leave-buffer-hook"); | 1061 DEFSYMBOL (Qmouse_leave_buffer_hook); |
1062 #endif | 1062 #endif |
1063 | 1063 |
1064 DEFSUBR (Finteractive); | 1064 DEFSUBR (Finteractive); |
1065 DEFSUBR (Fquote_maybe); | 1065 DEFSUBR (Fquote_maybe); |
1066 DEFSUBR (Fcall_interactively); | 1066 DEFSUBR (Fcall_interactively); |