Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
9d889332
Commit
9d889332
authored
Sep 11, 2009
by
Stefan Monnier
Browse files
(where_is_internal): Don't erroneously return nil right after
filling the cache. (where_is_internal_1): Fix up typo.
parent
b6fe8102
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
7 deletions
+17
-7
src/ChangeLog
src/ChangeLog
+6
-0
src/keymap.c
src/keymap.c
+11
-7
No files found.
src/ChangeLog
View file @
9d889332
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
...
...
src/keymap.c
View file @
9d889332
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment