Mercurial > emacs

changeset 45404:3885467d7b12

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* keymap.c (silly_event_symbol_error, Fsingle_key_description) (Fdescribe_buffer_bindings): Use SYMBOL_NAME and XSTRING instead of XSYMBOL and name field. (describe_command, describe_translation): Use SYMBOL_NAME and assignment instead of XSYMBOL and name field and XSETSTRING.
author Ken Raeburn <raeburn@raeburn.org>
date Mon, 20 May 2002 08:06:00 +0000
parents afd76daeaeef
children 13e858104d3b
files src/keymap.c
diffstat 1 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/keymap.c	Mon May 20 08:05:55 2002 +0000
+++ b/src/keymap.c	Mon May 20 08:06:00 2002 +0000
@@ -1221,8 +1221,8 @@
       error ((modifiers & ~meta_modifier
 	      ? "To bind the key %s, use [?%s], not [%s]"
 	      : "To bind the key %s, use \"%s\", not [%s]"),
-	     XSYMBOL (c)->name->data, XSTRING (keystring)->data,
-	     XSYMBOL (c)->name->data);
+	     XSTRING (SYMBOL_NAME (c))->data, XSTRING (keystring)->data,
+	     XSTRING (SYMBOL_NAME (c))->data);
     }
 }
 
@@ -2118,8 +2118,8 @@
       if (NILP (no_angles))
 	{
 	  char *buffer
-	    = (char *) alloca (STRING_BYTES (XSYMBOL (key)->name) + 5);
-	  sprintf (buffer, "<%s>", XSYMBOL (key)->name->data);
+	    = (char *) alloca (STRING_BYTES (XSTRING (SYMBOL_NAME (key))) + 5);
+	  sprintf (buffer, "<%s>", XSTRING (SYMBOL_NAME (key))->data);
 	  return build_string (buffer);
 	}
       else
@@ -2736,13 +2736,13 @@
 	  if (!SYMBOLP (modes[i]))
 	    abort();
 
-	  p = title = (char *) alloca (42 + XSYMBOL (modes[i])->name->size);
+	  p = title = (char *) alloca (42 + XSTRING (SYMBOL_NAME (modes[i]))->size);
 	  *p++ = '\f';
 	  *p++ = '\n';
 	  *p++ = '`';
-	  bcopy (XSYMBOL (modes[i])->name->data, p,
-		 XSYMBOL (modes[i])->name->size);
-	  p += XSYMBOL (modes[i])->name->size;
+	  bcopy (XSTRING (SYMBOL_NAME (modes[i]))->data, p,
+		 XSTRING (SYMBOL_NAME (modes[i]))->size);
+	  p += XSTRING (SYMBOL_NAME (modes[i]))->size;
 	  *p++ = '\'';
 	  bcopy (" Minor Mode Bindings", p, sizeof (" Minor Mode Bindings") - 1);
 	  p += sizeof (" Minor Mode Bindings") - 1;
@@ -2945,7 +2945,7 @@
 
   if (SYMBOLP (definition))
     {
-      XSETSTRING (tem1, XSYMBOL (definition)->name);
+      tem1 = SYMBOL_NAME (definition);
       insert1 (tem1);
       insert_string ("\n");
     }
@@ -2967,7 +2967,7 @@
 
   if (SYMBOLP (definition))
     {
-      XSETSTRING (tem1, XSYMBOL (definition)->name);
+      tem1 = SYMBOL_NAME (definition);
       insert1 (tem1);
       insert_string ("\n");
     }