Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
fb33fa43
Commit
fb33fa43
authored
Aug 02, 2011
by
Stefan Monnier
Browse files
* src/keymap.c (Fdefine_key): Fix Lisp_Object/int mixup; apply some CSE.
parent
92f2affc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
10 deletions
+7
-10
src/ChangeLog
src/ChangeLog
+4
-0
src/keymap.c
src/keymap.c
+3
-10
No files found.
src/ChangeLog
View file @
fb33fa43
2011-08-02 Stefan Monnier <monnier@iro.umontreal.ca>
* keymap.c (Fdefine_key): Fix Lisp_Object/int mixup; apply some CSE.
2010-12-03 Don March <don@ohspite.net>
* keymap.c (Fdefine_key): Fix non-prefix key error message when
...
...
src/keymap.c
View file @
fb33fa43
...
...
@@ -1217,16 +1217,9 @@ binding KEY to DEF is added at the front of KEYMAP. */)
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. */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment