diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2007-11-13 12:55:45 +0000 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2007-11-13 12:55:45 +0000 |
| commit | 1eb8d617f0b52c5f3134b36115cca6406d3420e2 (patch) | |
| tree | bc0c35b8f8727de62dea6d8c21c26f7fe8997705 /src/w32fns.c | |
| parent | b07a2d9cdbb2b49aae71e1103958faa3015bff2a (diff) | |
| download | emacs-1eb8d617f0b52c5f3134b36115cca6406d3420e2.tar.gz | |
(Fw32_register_hot_key): Don't try to register
hot key if w32_parse_hot_key returned nil.
Diffstat (limited to 'src/w32fns.c')
| -rw-r--r-- | src/w32fns.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/w32fns.c b/src/w32fns.c index 501fb391727..96c3ef3f7bc 100644 --- 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); |