# HG changeset patch # User Juanma Barranquero # Date 1194958545 0 # Node ID c157297ae42e486a1f8555045e07f7ec8ecee663 # Parent 64025782b13f6df50c3e8de652516008393911f4 (Fw32_register_hot_key): Don't try to register hot key if w32_parse_hot_key returned nil. diff -r 64025782b13f -r c157297ae42e src/w32fns.c --- a/src/w32fns.c Mon Nov 12 05:59:31 2007 +0000 +++ b/src/w32fns.c Tue Nov 13 12:55:45 2007 +0000 @@ -8233,7 +8233,7 @@ { 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);