From: Juanma Barranquero <lekktu@gmail.com>
Date: Tue, 13 Nov 2007 12:55:45 +0000 (+0000)
Subject: (Fw32_register_hot_key): Don't try to register
X-Git-Tag: emacs-pretest-22.1.90~393
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1eb8d617f0b52c5f3134b36115cca6406d3420e2;p=emacs.git

(Fw32_register_hot_key): Don't try to register
hot key if w32_parse_hot_key returned nil.
---

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);