mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-06 03:40:56 -08:00
Code Issues Projects Releases Wiki Activity

(Fw32_register_hot_key): Don't try to register

Browse source 
hot key if w32_parse_hot_key returned nil.
This commit is contained in:
Juanma Barranquero 2007-11-13 15:09:34 +00:00
parent a537330542
commit fb053a1f93
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/ChangeLog
View file

@ -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,Ae(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>

2
src/w32fns.c
View file

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