Mercurial > hg > xemacs-beta
diff 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 |
line wrap: on
line diff
--- a/src/callint.c Thu May 24 06:30:21 2001 +0000 +++ b/src/callint.c Thu May 24 07:51:33 2001 +0000 @@ -254,11 +254,11 @@ Lisp_Object tem; if (zmacs_regions && !zmacs_region_active_p) - error ("The region is not active now"); + invalid_operation ("The region is not active now", Qunbound); tem = Fmarker_buffer (current_buffer->mark); if (NILP (tem) || (XBUFFER (tem) != current_buffer)) - error ("The mark is not set now"); + invalid_operation ("The mark is not set now", Qunbound); return marker_position (current_buffer->mark); } @@ -499,7 +499,7 @@ prompt_data = (const char *) XSTRING_DATA (specs); if (prompt_data[prompt_index] == '+') - error ("`+' is not used in `interactive' for ordinary commands"); + syntax_error ("`+' is not used in `interactive' for ordinary commands", Qunbound); else if (prompt_data[prompt_index] == '*') { prompt_index++; @@ -528,7 +528,7 @@ if (MINI_WINDOW_P (XWINDOW (window)) && ! (minibuf_level > 0 && EQ (window, minibuf_window))) - error ("Attempt to select inactive minibuffer window"); + invalid_operation ("Attempt to select inactive minibuffer window", Qunbound); #if 0 /* unclean! see event-stream.c */ /* If the current buffer wants to clean up, let it. */ @@ -737,10 +737,9 @@ #endif if (NILP (event)) - error ("%s must be bound to a mouse or misc-user event", - (SYMBOLP (function) - ? (char *) string_data (XSYMBOL (function)->name) - : "command")); + signal_error (Qinvalid_operation, + "function must be bound to a mouse or misc-user event", + function); args[argnum] = event; mouse_event_count++; break; @@ -959,9 +958,10 @@ case '+': default: { - error ("Invalid `interactive' control letter \"%c\" (#o%03o).", - prompt_data[prompt_index], - prompt_data[prompt_index]); + signal_ferror (Qsyntax_error, + "Invalid `interactive' control letter \"%c\" (#o%03o).", + prompt_data[prompt_index], + prompt_data[prompt_index]); } } #undef PROMPT @@ -1035,30 +1035,30 @@ void syms_of_callint (void) { - defsymbol (&Qcall_interactively, "call-interactively"); - defsymbol (&Qread_from_minibuffer, "read-from-minibuffer"); - defsymbol (&Qcompleting_read, "completing-read"); - defsymbol (&Qread_file_name, "read-file-name"); - defsymbol (&Qread_directory_name, "read-directory-name"); - defsymbol (&Qread_string, "read-string"); - defsymbol (&Qread_buffer, "read-buffer"); - defsymbol (&Qread_variable, "read-variable"); - defsymbol (&Qread_function, "read-function"); - defsymbol (&Qread_command, "read-command"); - defsymbol (&Qread_number, "read-number"); - defsymbol (&Qread_expression, "read-expression"); + DEFSYMBOL (Qcall_interactively); + DEFSYMBOL (Qread_from_minibuffer); + DEFSYMBOL (Qcompleting_read); + DEFSYMBOL (Qread_file_name); + DEFSYMBOL (Qread_directory_name); + DEFSYMBOL (Qread_string); + DEFSYMBOL (Qread_buffer); + DEFSYMBOL (Qread_variable); + DEFSYMBOL (Qread_function); + DEFSYMBOL (Qread_command); + DEFSYMBOL (Qread_number); + DEFSYMBOL (Qread_expression); #if defined(MULE) || defined(FILE_CODING) - defsymbol (&Qread_coding_system, "read-coding-system"); - defsymbol (&Qread_non_nil_coding_system, "read-non-nil-coding-system"); + DEFSYMBOL (Qread_coding_system); + DEFSYMBOL (Qread_non_nil_coding_system); #endif - defsymbol (&Qevents_to_keys, "events-to-keys"); - defsymbol (&Qcommand_debug_status, "command-debug-status"); - defsymbol (&Qenable_recursive_minibuffers, "enable-recursive-minibuffers"); + DEFSYMBOL (Qevents_to_keys); + DEFSYMBOL (Qcommand_debug_status); + DEFSYMBOL (Qenable_recursive_minibuffers); defsymbol (&QletX, "let*"); - defsymbol (&Qsave_excursion, "save-excursion"); + DEFSYMBOL (Qsave_excursion); #if 0 /* ill-conceived */ - defsymbol (&Qmouse_leave_buffer_hook, "mouse-leave-buffer-hook"); + DEFSYMBOL (Qmouse_leave_buffer_hook); #endif DEFSUBR (Finteractive);