mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-26 15:21:51 -08:00
Code Issues Projects Releases Wiki Activity

* keymap.c (silly_event_symbol_error, Fsingle_key_description)

Browse source 
(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.
This commit is contained in:
Ken Raeburn 2002-05-20 08:06:00 +00:00
parent c60a57d71c
commit c85d524cf7
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/keymap.c
View file

@ -1221,8 +1221,8 @@ silly_event_symbol_error (c)
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 @@ around function keys and event symbols. */)
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 @@ You type Translation\n\
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 @@ describe_command (definition, args)
if (SYMBOLP (definition))
{
XSETSTRING (tem1, XSYMBOL (definition)->name);
tem1 = SYMBOL_NAME (definition);
insert1 (tem1);
insert_string ("\n");
}
@ -2967,7 +2967,7 @@ describe_translation (definition, args)
if (SYMBOLP (definition))
{
XSETSTRING (tem1, XSYMBOL (definition)->name);
tem1 = SYMBOL_NAME (definition);
insert1 (tem1);
insert_string ("\n");
}