procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(where_is_internal): Don't erroneously return nil right after

Browse source 
filling the cache.
(where_is_internal_1): Fix up typo.
This commit is contained in:
Stefan Monnier 2009-09-11 05:10:15 +00:00
parent b6fe810294
commit 9d88933246
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2009-09-11 Stefan Monnier <monnier@iro.umontreal.ca>
* keymap.c (where_is_internal): Don't erroneously return nil right after
filling the cache.
(where_is_internal_1): Fix up typo.
2009-09-11 Glenn Morris <rgm@gnu.org>
* frame.c (Fx_parse_geometry): Unify the X and NS versions so that they

18
src/keymap.c
View file

@ -2765,12 +2765,16 @@ where_is_internal (Lisp_Object definition, Lisp_Object keymaps,
}
if (nomenus && !noindirect)
/* Remember for which keymaps this cache was built.
We do it here (late) because we want to keep where_is_cache_keymaps
set to t while the cache isn't fully filled. */
where_is_cache_keymaps = keymaps;
return data.sequences;
{ /* Remember for which keymaps this cache was built.
We do it here (late) because we want to keep where_is_cache_keymaps
set to t while the cache isn't fully filled. */
where_is_cache_keymaps = keymaps;
/* During cache-filling, data.sequences is not filled by
where_is_internal_1. */
return Fgethash (definition, where_is_cache, Qnil);
}
else
return data.sequences;
}
static Lisp_Object Vwhere_is_preferred_modifier;
@ -2973,7 +2977,7 @@ where_is_internal_1 (key, binding, args, data)
Lisp_Object sequence;
/* Search through indirections unless that's not wanted. */
if (noindirect)
if (!noindirect)
binding = get_keyelt (binding, 0);
/* End this iteration if this element does not match