Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
d5b3eb1b
Commit
d5b3eb1b
authored
Dec 13, 2000
by
Stefan Monnier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(get_keyelt): Only eval the filter if `autoload' is set.
parent
341a09cf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
8 deletions
+10
-8
src/ChangeLog
src/ChangeLog
+8
-2
src/keymap.c
src/keymap.c
+2
-6
No files found.
src/ChangeLog
View file @
d5b3eb1b
2000-12-13 Stefan Monnier <monnier@cs.yale.edu>
* keymap.c (get_keyelt): Only eval the filter if `autoload' is set.
* keyboard.c (menu_bar_items, tool_bar_items):
Set `autoload' when looking up `tool-bar' or `menu-bar' submap.
2000-12-13 Gerd Moellmann <gerd@gnu.org>
* xterm.c (x_term_init): Declare gray_bitmap_bits as `extern
char *'
* xterm.c (x_term_init): Declare gray_bitmap_bits as `extern char *'.
* xfns.c (gray_bitmap_bits): Declare `char *'.
...
...
src/keymap.c
View file @
d5b3eb1b
...
...
@@ -615,18 +615,14 @@ get_keyelt (object, autoload)
/* If there's a `:filter FILTER', apply FILTER to the
menu-item's definition to get the real definition to
use. Temporarily inhibit GC while evaluating FILTER,
because not functions calling get_keyelt are prepared
for a GC. */
use. */
for
(;
CONSP
(
tem
)
&&
CONSP
(
XCDR
(
tem
));
tem
=
XCDR
(
tem
))
if
(
EQ
(
XCAR
(
tem
),
QCfilter
))
if
(
EQ
(
XCAR
(
tem
),
QCfilter
)
&&
autoload
)
{
int
count
=
inhibit_garbage_collection
();
Lisp_Object
filter
;
filter
=
XCAR
(
XCDR
(
tem
));
filter
=
list2
(
filter
,
list2
(
Qquote
,
object
));
object
=
menu_item_eval_property
(
filter
);
unbind_to
(
count
,
Qnil
);
break
;
}
}
...
...
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