projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b07a2d9
)
(Fw32_register_hot_key): Don't try to register
author
Juanma Barranquero
<lekktu@gmail.com>
Tue, 13 Nov 2007 12:55:45 +0000
(12:55 +0000)
committer
Juanma Barranquero
<lekktu@gmail.com>
Tue, 13 Nov 2007 12:55:45 +0000
(12:55 +0000)
hot key if w32_parse_hot_key returned nil.
src/w32fns.c
patch
|
blob
|
history
diff --git
a/src/w32fns.c
b/src/w32fns.c
index 501fb3917270fe9a917ff3091ef7f086aa495124..96c3ef3f7bc81ac616b94145728d429f786007a3 100644
(file)
--- a/
src/w32fns.c
+++ b/
src/w32fns.c
@@
-8233,7
+8233,7
@@
The return value is the hotkey-id if registered, otherwise nil. */)
{
key = w32_parse_hot_key (key);
- if (NILP (Fmemq (key, w32_grabbed_keys)))
+ if (
!NILP (key) &&
NILP (Fmemq (key, w32_grabbed_keys)))
{
/* Reuse an empty slot if possible. */
Lisp_Object item = Fmemq (Qnil, w32_grabbed_keys);