[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/keymap.c
From: |
Ken Raeburn |
Subject: |
[Emacs-diffs] Changes to emacs/src/keymap.c |
Date: |
Mon, 20 May 2002 04:06:01 -0400 |
Index: emacs/src/keymap.c
diff -c emacs/src/keymap.c:1.261 emacs/src/keymap.c:1.262
*** emacs/src/keymap.c:1.261 Mon May 13 23:04:24 2002
--- emacs/src/keymap.c Mon May 20 04:06:00 2002
***************
*** 1221,1228 ****
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);
}
}
--- 1221,1228 ----
error ((modifiers & ~meta_modifier
? "To bind the key %s, use [?%s], not [%s]"
: "To bind the key %s, use \"%s\", not [%s]"),
! XSTRING (SYMBOL_NAME (c))->data, XSTRING (keystring)->data,
! XSTRING (SYMBOL_NAME (c))->data);
}
}
***************
*** 2118,2125 ****
if (NILP (no_angles))
{
char *buffer
! = (char *) alloca (STRING_BYTES (XSYMBOL (key)->name) + 5);
! sprintf (buffer, "<%s>", XSYMBOL (key)->name->data);
return build_string (buffer);
}
else
--- 2118,2125 ----
if (NILP (no_angles))
{
char *buffer
! = (char *) alloca (STRING_BYTES (XSTRING (SYMBOL_NAME (key))) + 5);
! sprintf (buffer, "<%s>", XSTRING (SYMBOL_NAME (key))->data);
return build_string (buffer);
}
else
***************
*** 2736,2748 ****
if (!SYMBOLP (modes[i]))
abort();
! p = title = (char *) alloca (42 + XSYMBOL (modes[i])->name->size);
*p++ = '\f';
*p++ = '\n';
*p++ = '`';
! bcopy (XSYMBOL (modes[i])->name->data, p,
! XSYMBOL (modes[i])->name->size);
! p += XSYMBOL (modes[i])->name->size;
*p++ = '\'';
bcopy (" Minor Mode Bindings", p, sizeof (" Minor Mode Bindings") -
1);
p += sizeof (" Minor Mode Bindings") - 1;
--- 2736,2748 ----
if (!SYMBOLP (modes[i]))
abort();
! p = title = (char *) alloca (42 + XSTRING (SYMBOL_NAME
(modes[i]))->size);
*p++ = '\f';
*p++ = '\n';
*p++ = '`';
! 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,2951 ****
if (SYMBOLP (definition))
{
! XSETSTRING (tem1, XSYMBOL (definition)->name);
insert1 (tem1);
insert_string ("\n");
}
--- 2945,2951 ----
if (SYMBOLP (definition))
{
! tem1 = SYMBOL_NAME (definition);
insert1 (tem1);
insert_string ("\n");
}
***************
*** 2967,2973 ****
if (SYMBOLP (definition))
{
! XSETSTRING (tem1, XSYMBOL (definition)->name);
insert1 (tem1);
insert_string ("\n");
}
--- 2967,2973 ----
if (SYMBOLP (definition))
{
! tem1 = SYMBOL_NAME (definition);
insert1 (tem1);
insert_string ("\n");
}