Mercurial > hg > xemacs-beta

diff src/keymap.c @ 3025:facf3239ba30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2005-10-25 11:16:19 by ben] rename new->new_, convert 'foo to `foo' EmacsFrame.c, ExternalClient.c, ExternalShell.c, chartab.c, cmdloop.c, compiler.h, console.c, database.c, device-msw.c, device-x.c, device.c, doc.c, dragdrop.c, eval.c, event-msw.c, event-stream.c, events.c, extents.c, file-coding.c, fns.c, frame-tty.c, frame.c, gpmevent.c, gutter.c, hash.c, imgproc.c, indent.c, keymap.c, lisp-union.h, macros.c, malloc.c, marker.c, menubar-x.c, menubar.c, mule-charset.c, number.c, process.c, profile.h, ralloc.c, redisplay.c, select-common.h, select.c, syntax.c, sysfile.h, sysproc.h, systime.h, syswindows.h, toolbar.c, tooltalk.c, tparam.c, unexaix.c, unexalpha.c, unexconvex.c, unexec.c, unexhp9k800.c, unexmips.c, unicode.c, window.c: new -> new_. 'foo -> `foo'. lwlib-internal.h: redo assert macros to follow lisp.h and not trigger warnings. lwlib.c, xlwtabs.c: new -> new_.
author ben
date Tue, 25 Oct 2005 11:16:49 +0000
parents 1e7cc382eb16
children c6ef6267f65c 3742ea8250b5
line wrap: on
line diff
--- a/src/keymap.c	Tue Oct 25 08:32:50 2005 +0000
+++ b/src/keymap.c	Tue Oct 25 11:16:49 2005 +0000
@@ -50,7 +50,7 @@
    table	   A hash table, hashing keysyms to their bindings.
    		   It will be one of the following:
 
-		   -- a symbol, e.g. 'home
+		   -- a symbol, e.g. `home'
 		   -- a character, representing something printable
 		      (not ?\C-c meaning C-c, for instance)
 		   -- an integer representing a modifier combination
@@ -1177,7 +1177,7 @@
   /* When we encounter a keymap which is indirected through a
      symbol, we need to copy the sub-map.  In v18, the form
        (lookup-key (copy-keymap global-map) "\C-x")
-     returned a new keymap, not the symbol 'Control-X-prefix.
+     returned a new keymap, not the symbol `Control-X-prefix'.
    */
   value = get_keymap (value, 0, 1); /* #### autoload GC-safe here? */
   if (KEYMAPP (value))
@@ -1297,11 +1297,12 @@
     {
       Ibyte *name = XSTRING_DATA (XSYMBOL (*keysym)->name);
 
-      /* FSFmacs uses symbols with the printed representation of keysyms in
-	 their names, like 'M-x, and we use the syntax '(meta x).  So, to avoid
-	 confusion, notice the M-x syntax and signal an error - because
-	 otherwise it would be interpreted as a regular keysym, and would even
-	 show up in the list-buffers output, causing confusion to the naive.
+      /* GNU Emacs uses symbols with the printed representation of keysyms in
+	 their names, like `M-x', and we use the syntax '(meta x).  So, to
+	 avoid confusion, notice the M-x syntax and signal an error -
+	 because otherwise it would be interpreted as a regular keysym, and
+	 would even show up in the list-buffers output, causing confusion
+	 to the naive.
 
 	 We can get away with this because none of the X keysym names contain
 	 a hyphen (some contain underscore, however).
@@ -1574,19 +1575,19 @@
     return 0;
 
   /* if the specifier is an integer such as 27, then it should match
-     both of the events 'escape' and 'control ['.  Calling
-     Fcharacter_to_event() will only match 'escape'. */
+     both of the events `escape' and `control ['.  Calling
+     Fcharacter_to_event() will only match `escape'. */
   if (CHAR_OR_CHAR_INTP (key_specifier))
     return (XCHAR_OR_CHAR_INT (key_specifier)
 	    == event_to_character (event, 0, 0));
 
   /* Otherwise, we cannot call event_to_character() because we may
      be dealing with non-ASCII keystrokes.  In any case, if I ask
-     for 'control [' then I should get exactly that, and not
-     'escape'.
-
-     However, we have to behave differently on TTY's, where 'control ['
-     is silently converted into 'escape' by the keyboard driver.
+     for `control [' then I should get exactly that, and not
+     `escape'.
+
+     However, we have to behave differently on TTY's, where `control ['
+     is silently converted into `escape' by the keyboard driver.
      In this case, ASCII is the only thing we know about, so we have
      to compare the ASCII values. */
 
@@ -2687,7 +2688,7 @@
 process_event_binding_result (Lisp_Object result)
 {
   if (EQ (result, Qundefined))
-    /* The suppress-keymap function binds keys to 'undefined - special-case
+    /* The suppress-keymap function binds keys to `undefined' - special-case
        that here, so that being bound to that has the same error-behavior as
        not being defined at all.
        */
@@ -3735,8 +3736,8 @@
 	  int size = lower_keys_count + 50;
 	  if (! c->keys_so_far_malloced)
 	    {
-	      Lisp_Key_Data *new = xnew_array (Lisp_Key_Data, size);
-	      memcpy ((void *)new, (const void *)c->keys_so_far,
+	      Lisp_Key_Data *new_ = xnew_array (Lisp_Key_Data, size);
+	      memcpy ((void *)new_, (const void *)c->keys_so_far,
 		      c->keys_so_far_total_size * sizeof (Lisp_Key_Data));
 	    }
 	  else