[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r105384: * src/keymap.c (Fdefine_key)
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r105384: * src/keymap.c (Fdefine_key): Fix Lisp_Object/int mixup; apply some CSE. |
Date: |
Tue, 02 Aug 2011 12:02:52 -0400 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 105384
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2011-08-02 12:02:52 -0400
message:
* src/keymap.c (Fdefine_key): Fix Lisp_Object/int mixup; apply some CSE.
modified:
src/ChangeLog
src/keymap.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-08-02 15:27:38 +0000
+++ b/src/ChangeLog 2011-08-02 16:02:52 +0000
@@ -1,3 +1,7 @@
+2011-08-02 Stefan Monnier <address@hidden>
+
+ * keymap.c (Fdefine_key): Fix Lisp_Object/int mixup; apply some CSE.
+
2010-12-03 Don March <address@hidden>
* keymap.c (Fdefine_key): Fix non-prefix key error message when
=== modified file 'src/keymap.c'
--- a/src/keymap.c 2011-08-02 15:27:38 +0000
+++ b/src/keymap.c 2011-08-02 16:02:52 +0000
@@ -1217,16 +1217,9 @@
keymap = get_keymap (cmd, 0, 1);
if (!CONSP (keymap))
{
- char trailing_esc[5];
- if (c == meta_prefix_char && metized)
- {
- if (idx == 0)
- strcpy(trailing_esc, "ESC");
- else
- strcpy(trailing_esc, " ESC");
- }
- else
- strcpy(trailing_esc, "");
+ const char *trailing_esc = ((EQ (c, meta_prefix_char) && metized)
+ ? (idx == 0 ? "ESC" : " ESC")
+ : "");
/* We must use Fkey_description rather than just passing key to
error; key might be a vector, not a string. */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r105384: * src/keymap.c (Fdefine_key): Fix Lisp_Object/int mixup; apply some CSE.,
Stefan Monnier <=