mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-31 09:20:54 -08:00
Code Issues Projects Releases Wiki Activity

(menu_bar_item): Use internal_condition_case_1.

Browse source 
(menu_bar_item_1): New function.
This commit is contained in:
Richard M. Stallman 1994-02-07 01:03:39 +00:00
parent d227775c81
commit 047a8ea77d
1 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/keyboard.c
View file

@ -3586,6 +3586,15 @@ menu_bar_one_keymap (keymap, result)
return result;
}
/* This is used as the handler when calling internal_condition_case_1. */
static Lisp_Object
menu_bar_item_1 (arg)
Lisp_Object arg;
{
return Qnil;
}
static Lisp_Object
menu_bar_item (key, item_string, def, result)
Lisp_Object key, item_string, def, result;
@ -3610,7 +3619,10 @@ menu_bar_item (key, item_string, def, result)
Otherwise, enable if value is not nil. */
tem = Fget (def, Qmenu_enable);
if (!NILP (tem))
enabled = Feval (tem);
/* (condition-case nil (eval tem)
(error nil)) */
enabled = internal_condition_case_1 (Feval, tem, Qerror,
menu_bar_item_1);
}
/* Add an entry for this key and string