diff options
Diffstat (limited to 'src/minibuf.c')
| -rw-r--r-- | src/minibuf.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/minibuf.c b/src/minibuf.c index 986765ae6fb..4adf665f8f4 100644 --- a/src/minibuf.c +++ b/src/minibuf.c | |||
| @@ -649,12 +649,7 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt, | |||
| 649 | if (STRINGP (input_method) && !NILP (Ffboundp (Qactivate_input_method))) | 649 | if (STRINGP (input_method) && !NILP (Ffboundp (Qactivate_input_method))) |
| 650 | call1 (Qactivate_input_method, input_method); | 650 | call1 (Qactivate_input_method, input_method); |
| 651 | 651 | ||
| 652 | /* Run our hook, but not if it is empty. | 652 | Frun_hooks (1, &Qminibuffer_setup_hook); |
| 653 | (run-hooks would do nothing if it is empty, | ||
| 654 | but it's important to save time here in the usual case.) */ | ||
| 655 | if (!NILP (Vminibuffer_setup_hook) && !EQ (Vminibuffer_setup_hook, Qunbound) | ||
| 656 | && !NILP (Vrun_hooks)) | ||
| 657 | call1 (Vrun_hooks, Qminibuffer_setup_hook); | ||
| 658 | 653 | ||
| 659 | /* Don't allow the user to undo past this point. */ | 654 | /* Don't allow the user to undo past this point. */ |
| 660 | BVAR (current_buffer, undo_list) = Qnil; | 655 | BVAR (current_buffer, undo_list) = Qnil; |
| @@ -806,10 +801,7 @@ get_minibuffer (int depth) | |||
| 806 | static Lisp_Object | 801 | static Lisp_Object |
| 807 | run_exit_minibuf_hook (Lisp_Object data) | 802 | run_exit_minibuf_hook (Lisp_Object data) |
| 808 | { | 803 | { |
| 809 | if (!NILP (Vminibuffer_exit_hook) && !EQ (Vminibuffer_exit_hook, Qunbound) | 804 | safe_run_hooks (Qminibuffer_exit_hook); |
| 810 | && !NILP (Vrun_hooks)) | ||
| 811 | safe_run_hooks (Qminibuffer_exit_hook); | ||
| 812 | |||
| 813 | return Qnil; | 805 | return Qnil; |
| 814 | } | 806 | } |
| 815 | 807 | ||