(Fw32_register_hot_key): Don't try to register

hot key if w32_parse_hot_key returned nil.

diff --git a/src/ChangeLog b/src/ChangeLog
index 4cf00fc3c308516a190a8da0955fc799edcce0c6..b8a8445155e521cd465f7aaaf217061e2a19cc91 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-13  Juanma Barranquero  <lekktu@gmail.com>
+
+       * w32fns.c (Fw32_register_hot_key): Don't try to register hot key
+       if w32_parse_hot_key returned nil.
+
 2007-11-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * xdisp.c (load_overlay_strings): Fix copy&paste typo.
@@ -107,7 +112,7 @@
 2007-11-01  Johan Bockg\e,Ae\e(Brd  <bojohan@gnu.org>
 
        * macterm.c, w32term.c, xterm.c (x_draw_stretch_glyph_string):
-        Don't set s->stippled_p here, since it has already been set by
+       Don't set s->stippled_p here, since it has already been set by
        x_set_glyph_string_gc from x_draw_glyph_string.
 
 2007-11-01  Dan Nicolaescu  <dann@ics.uci.edu>

diff --git a/src/w32fns.c b/src/w32fns.c
index 6199b16bb2fe82b48a2d5ffb1abeeccab0796547..c8daa6467204ca072eb1e93a629e7bd67302edf0 100644 (file)
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -8263,7 +8263,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);