Mercurial > hg > xemacs-beta

diff src/keymap.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 7039e6323819
children b39c14581166
line wrap: on
line diff
--- a/src/keymap.c	Thu May 24 06:30:21 2001 +0000
+++ b/src/keymap.c	Thu May 24 07:51:33 2001 +0000
@@ -256,7 +256,7 @@
   Lisp_Keymap *keymap = XKEYMAP (obj);
   char buf[200];
   if (print_readably)
-    error ("printing unreadable object #<keymap 0x%x>", keymap->header.uid);
+    printing_unreadable_object ("#<keymap 0x%x>", keymap->header.uid);
   write_c_string ("#<keymap ", printcharfun);
   if (!NILP (keymap->name))
     {
@@ -387,8 +387,7 @@
       keymap = get_keymap (keymap, 1, 1);
       if (EQ (keymap, start_keymap))
 	{
-	  signal_simple_error ("Cyclic keymap indirection",
-			       start_keymap);
+	  invalid_argument ("Cyclic keymap indirection", start_keymap);
 	}
     }
 }
@@ -586,7 +585,7 @@
       Lisp_Object maps;
 
       if (XKEYMAP (def) == to_keymap)
-	signal_simple_error ("Cyclic keymap definition", def);
+	invalid_argument ("Cyclic keymap definition", def);
 
       for (maps = keymap_submaps (def);
 	   CONSP (maps);
@@ -1277,16 +1276,16 @@
 	  /* || (XCHAR (*keysym) >= 128 && XCHAR (*keysym) < 160) */)
 	/* yuck!  Can't make the above restriction; too many compatibility
 	   problems ... */
-	signal_simple_error ("keysym char must be printable", *keysym);
+	invalid_argument ("keysym char must be printable", *keysym);
       /* #### This bites!  I want to be able to write (control shift a) */
       if (modifiers & XEMACS_MOD_SHIFT)
-	signal_simple_error
+	invalid_argument
 	  ("The `shift' modifier may not be applied to ASCII keysyms",
 	   spec);
     }
   else
     {
-      signal_simple_error ("Unknown keysym specifier", *keysym);
+      invalid_argument ("Unknown keysym specifier", *keysym);
     }
 
   if (SYMBOLP (*keysym))
@@ -1325,7 +1324,7 @@
 	    !strcmp (name, "BS")))
 #endif /* unused */
           )
-	signal_simple_error
+	invalid_argument
           ("Invalid (FSF Emacs) key format (see doc of define-key)",
 	   *keysym);
 
@@ -1447,17 +1446,14 @@
 	    break;
 	  }
 	default:
-	  signal_error (Qwrong_type_argument,
-			list2 (build_translated_string
-			       ("unable to bind this type of event"),
-			       spec));
+	  wtaerror ("unable to bind this type of event", spec);
 	}
     }
   else if (SYMBOLP (spec))
     {
       /* Be nice, allow = to mean (=) */
       if (bucky_sym_to_bucky_bit (spec) != 0)
-        signal_simple_error ("Key is a modifier name", spec);
+        invalid_argument ("Key is a modifier name", spec);
       define_key_check_and_coerce_keysym (spec, &spec, 0);
       returned_value->keysym = spec;
       returned_value->modifiers = 0;
@@ -1479,19 +1475,20 @@
 	  if (!NILP (XCDR (rest)))
 	    {
 	      if (! modifier)
-		signal_simple_error ("Unknown modifier", keysym);
+		invalid_argument ("Unknown modifier", keysym);
 	    }
 	  else
 	    {
 	      if (modifier)
-		signal_simple_error ("Nothing but modifiers here",
+		sferror ("Nothing but modifiers here",
 				     spec);
 	    }
 	  rest = XCDR (rest);
 	  QUIT;
 	}
       if (!NILP (rest))
-        signal_simple_error ("List must be nil-terminated", spec);
+        signal_error (Qlist_formation_error,
+			   "List must be nil-terminated", spec);
 
       define_key_check_and_coerce_keysym (spec, &keysym, modifiers);
       returned_value->keysym = keysym;
@@ -1499,7 +1496,7 @@
     }
   else
     {
-      signal_simple_error ("Unknown key-sequence specifier",
+      invalid_argument ("Unknown key-sequence specifier",
 			   spec);
     }
 }
@@ -1518,7 +1515,7 @@
     {
       Lisp_Object fn, arg;
       if (! NILP (Fcdr (Fcdr (list))))
-	signal_simple_error ("Invalid menu event desc", list);
+	invalid_argument ("Invalid menu event desc", list);
       arg = Fcar (Fcdr (list));
       if (SYMBOLP (arg))
 	fn = Qcall_interactively;
@@ -1541,7 +1538,8 @@
       EQ (raw_key.keysym, Qbutton5) || EQ (raw_key.keysym, Qbutton5up) ||
       EQ (raw_key.keysym, Qbutton6) || EQ (raw_key.keysym, Qbutton6up) ||
       EQ (raw_key.keysym, Qbutton7) || EQ (raw_key.keysym, Qbutton7up))
-    error ("Mouse-clicks can't appear in saved keyboard macros.");
+    invalid_operation ("Mouse-clicks can't appear in saved keyboard macros",
+		       Qunbound);
 
   XEVENT (event)->channel = Vselected_console;
   XEVENT (event)->event_type = key_press_event;
@@ -1724,18 +1722,19 @@
     }
 
   if (EQ (keys, new_keys))
-    error_with_frob (mpc_binding,
-		     "can't bind %s: %s has a non-keymap binding",
-		     (char *) XSTRING_DATA (Fkey_description (keys)),
-		     (char *) XSTRING_DATA (Fsingle_key_description
-					    (Vmeta_prefix_char)));
+    signal_ferror_with_frob (Qinvalid_operation, mpc_binding,
+			     "can't bind %s: %s has a non-keymap binding",
+			     (char *) XSTRING_DATA (Fkey_description (keys)),
+			     (char *) XSTRING_DATA (Fsingle_key_description
+						    (Vmeta_prefix_char)));
   else
-    error_with_frob (mpc_binding,
-		     "can't bind %s: %s %s has a non-keymap binding",
-		     (char *) XSTRING_DATA (Fkey_description (keys)),
-		     (char *) XSTRING_DATA (Fkey_description (new_keys)),
-		     (char *) XSTRING_DATA (Fsingle_key_description
-					    (Vmeta_prefix_char)));
+    signal_ferror_with_frob (Qinvalid_operation, mpc_binding,
+			     "can't bind %s: %s %s has a non-keymap binding",
+			     (char *) XSTRING_DATA (Fkey_description (keys)),
+			     (char *) XSTRING_DATA (Fkey_description
+						    (new_keys)),
+			     (char *) XSTRING_DATA (Fsingle_key_description
+						    (Vmeta_prefix_char)));
 }
 
 DEFUN ("define-key", Fdefine_key, 3, 3, 0, /*
@@ -1921,7 +1920,7 @@
 				   XKEYMAP (keymap)->table, Qnil);
 	      if (!NILP (meta_map)
 		  && keymap_fullness (meta_map) != 0)
-		signal_simple_error_2
+		invalid_operation_2
 		  ("Map contains meta-bindings, can't bind",
 		   Fsingle_key_description (Vmeta_prefix_char), keymap);
               NUNGCPRO;
@@ -1977,7 +1976,7 @@
 	    keymap_store (keymap, &raw_key1, cmd);
 	  }
 	if (NILP (Fkeymapp (cmd)))
-          signal_simple_error_2 ("Invalid prefix keys in sequence",
+          sferror_2 ("Invalid prefix keys in sequence",
 				 c, keys);
 
 	if (ascii_hack && !NILP (raw_key2.keysym) &&
@@ -3278,7 +3277,7 @@
 #endif
 		strcpy (bufp, (char *) string_data (XSYMBOL (keysym)->name));
 	      if (!NILP (XCDR (rest)))
-		signal_simple_error ("Invalid key description",
+		invalid_argument ("Invalid key description",
 				     key);
 	    }
 	}
@@ -3312,8 +3311,9 @@
       Lisp_Object ch = Fevent_to_character (chr, Qnil, Qnil, Qt);
       if (NILP (ch))
 	return
-	  signal_simple_continuable_error
-	    ("character has no ASCII equivalent", Fcopy_event (chr, Qnil));
+	  signal_continuable_error
+	    (Qinvalid_argument,
+	     "character has no ASCII equivalent", Fcopy_event (chr, Qnil));
       chr = ch;
     }