Mercurial > hg > xemacs-beta

diff src/editfns.c @ 563:183866b06e0b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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 54fa1a5c2d12
children 5fd7ba8b56e7
line wrap: on
line diff
--- a/src/editfns.c	Thu May 24 06:30:21 2001 +0000
+++ b/src/editfns.c	Thu May 24 07:51:33 2001 +0000
@@ -111,9 +111,8 @@
     {
       Lisp_Object ch2 = Fevent_to_character (character, Qt, Qnil, Qnil);
       if (NILP (ch2))
-	return
-	  signal_simple_continuable_error
-	    ("character has no ASCII equivalent:", Fcopy_event (character, Qnil));
+        invalid_argument
+	  ("character has no ASCII equivalent:", Fcopy_event (character, Qnil));
       character = ch2;
     }
 
@@ -234,7 +233,7 @@
     Fsignal (Qmark_inactive, Qnil);
 #endif
   m = Fmarker_position (b->mark);
-  if (NILP (m)) error ("There is no region now");
+  if (NILP (m)) invalid_operation ("There is no region now", Qunbound);
   if (!!(BUF_PT (b) < XINT (m)) == !!beginningp)
     return make_int (BUF_PT (b));
   else
@@ -1110,7 +1109,7 @@
   CHECK_STRING (format_string);
 
   if (! lisp_to_time (time_, &value))
-    error ("Invalid time specification");
+    invalid_argument ("Invalid time specification", Qunbound);
 
   /* This is probably enough.  */
   size = XSTRING_LENGTH (format_string) * 6 + 50;
@@ -1151,7 +1150,7 @@
   Lisp_Object list_args[9];
 
   if (! lisp_to_time (specified_time, &time_spec))
-    error ("Invalid time specification");
+    invalid_argument ("Invalid time specification", Qunbound);
 
   decoded_time = localtime (&time_spec);
   list_args[0] = make_int (decoded_time->tm_sec);
@@ -1228,7 +1227,7 @@
 	  tzstring = tzbuf;
 	}
       else
-	error ("Invalid time zone specification");
+ invalid_argument ("Invalid time zone specification", Qunbound);
 
       /* Set TZ before calling mktime; merely adjusting mktime's returned
 	 value doesn't suffice, since that would mishandle leap seconds.  */
@@ -1246,7 +1245,7 @@
     }
 
   if (the_time == (time_t) -1)
-    error ("Specified time is not representable");
+    invalid_argument ("Specified time is not representable", Qunbound);
 
   return wasteful_word_to_lisp (the_time);
 }
@@ -2382,9 +2381,9 @@
   len2 = endr2 - startr2;
 
   if (startr2 < endr1)
-    error ("transposed regions not properly ordered");
+    invalid_argument ("transposed regions not properly ordered", Qunbound);
   else if (startr1 == endr1 || startr2 == endr2)
-    error ("transposed region may not be of length 0");
+    invalid_argument ("transposed region may not be of length 0", Qunbound);
 
   string1 = make_string_from_buffer (buf, startr1, len1);
   string2 = make_string_from_buffer (buf, startr2, len2);
@@ -2409,12 +2408,12 @@
 void
 syms_of_editfns (void)
 {
-  defsymbol (&Qpoint, "point");
-  defsymbol (&Qmark, "mark");
-  defsymbol (&Qregion_beginning, "region-beginning");
-  defsymbol (&Qregion_end, "region-end");
-  defsymbol (&Qformat, "format");
-  defsymbol (&Quser_files_and_directories, "user-files-and-directories");
+  DEFSYMBOL (Qpoint);
+  DEFSYMBOL (Qmark);
+  DEFSYMBOL (Qregion_beginning);
+  DEFSYMBOL (Qregion_end);
+  DEFSYMBOL (Qformat);
+  DEFSYMBOL (Quser_files_and_directories);
 
   DEFSUBR (Fchar_equal);
   DEFSUBR (Fchar_Equal);
@@ -2480,9 +2479,9 @@
   DEFSUBR (Fsave_restriction);
   DEFSUBR (Ftranspose_regions);
 
-  defsymbol (&Qzmacs_update_region, "zmacs-update-region");
-  defsymbol (&Qzmacs_deactivate_region, "zmacs-deactivate-region");
-  defsymbol (&Qzmacs_region_buffer, "zmacs-region-buffer");
+  DEFSYMBOL (Qzmacs_update_region);
+  DEFSYMBOL (Qzmacs_deactivate_region);
+  DEFSYMBOL (Qzmacs_region_buffer);
 }
 
 void