diff options
Diffstat (limited to 'src/keyboard.c')
| -rw-r--r-- | src/keyboard.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index 70098d46ebb..d307250b868 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -1134,7 +1134,7 @@ command_loop_2 (Lisp_Object ignore) | |||
| 1134 | static Lisp_Object | 1134 | static Lisp_Object |
| 1135 | top_level_2 (void) | 1135 | top_level_2 (void) |
| 1136 | { | 1136 | { |
| 1137 | return Feval (Vtop_level); | 1137 | return Feval (Vtop_level, Qnil); |
| 1138 | } | 1138 | } |
| 1139 | 1139 | ||
| 1140 | Lisp_Object | 1140 | Lisp_Object |
| @@ -3095,7 +3095,7 @@ read_char (int commandflag, int nmaps, Lisp_Object *maps, Lisp_Object prev_event | |||
| 3095 | help_form_saved_window_configs); | 3095 | help_form_saved_window_configs); |
| 3096 | record_unwind_protect (read_char_help_form_unwind, Qnil); | 3096 | record_unwind_protect (read_char_help_form_unwind, Qnil); |
| 3097 | 3097 | ||
| 3098 | tem0 = Feval (Vhelp_form); | 3098 | tem0 = Feval (Vhelp_form, Qnil); |
| 3099 | if (STRINGP (tem0)) | 3099 | if (STRINGP (tem0)) |
| 3100 | internal_with_output_to_temp_buffer ("*Help*", print_help, tem0); | 3100 | internal_with_output_to_temp_buffer ("*Help*", print_help, tem0); |
| 3101 | 3101 | ||
| @@ -7571,6 +7571,12 @@ menu_item_eval_property_1 (Lisp_Object arg) | |||
| 7571 | return Qnil; | 7571 | return Qnil; |
| 7572 | } | 7572 | } |
| 7573 | 7573 | ||
| 7574 | static Lisp_Object | ||
| 7575 | eval_dyn (Lisp_Object form) | ||
| 7576 | { | ||
| 7577 | return Feval (form, Qnil); | ||
| 7578 | } | ||
| 7579 | |||
| 7574 | /* Evaluate an expression and return the result (or nil if something | 7580 | /* Evaluate an expression and return the result (or nil if something |
| 7575 | went wrong). Used to evaluate dynamic parts of menu items. */ | 7581 | went wrong). Used to evaluate dynamic parts of menu items. */ |
| 7576 | Lisp_Object | 7582 | Lisp_Object |
| @@ -7579,7 +7585,7 @@ menu_item_eval_property (Lisp_Object sexpr) | |||
| 7579 | int count = SPECPDL_INDEX (); | 7585 | int count = SPECPDL_INDEX (); |
| 7580 | Lisp_Object val; | 7586 | Lisp_Object val; |
| 7581 | specbind (Qinhibit_redisplay, Qt); | 7587 | specbind (Qinhibit_redisplay, Qt); |
| 7582 | val = internal_condition_case_1 (Feval, sexpr, Qerror, | 7588 | val = internal_condition_case_1 (eval_dyn, sexpr, Qerror, |
| 7583 | menu_item_eval_property_1); | 7589 | menu_item_eval_property_1); |
| 7584 | return unbind_to (count, val); | 7590 | return unbind_to (count, val); |
| 7585 | } | 7591 | } |