changeset 8001:1a6bff2bc0e7

(read_minibuf_unwind): Run Qminibuffer_exit_hook here. (read_minibuf): Not here.
author Richard M. Stallman <rms@gnu.org>
date Tue, 21 Jun 1994 20:49:12 +0000
parents 6d0a448be1ec
children f8c8bbeca971
files src/minibuf.c
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/minibuf.c	Tue Jun 21 20:22:56 1994 +0000
+++ b/src/minibuf.c	Tue Jun 21 20:49:12 1994 +0000
@@ -252,10 +252,6 @@
 /* ??? MCC did redraw_screen here if switching screens.  */
   recursive_edit_1 ();
 
-  if (!NILP (Vminibuffer_exit_hook) && !EQ (Vminibuffer_exit_hook, Qunbound)
-      && !NILP (Vrun_hooks))
-    call1 (Vrun_hooks, Qminibuffer_exit_hook);
-
   /* If cursor is on the minibuffer line,
      show the user we have exited by putting it in column 0.  */
   if ((FRAME_CURSOR_Y (selected_frame)
@@ -353,6 +349,12 @@
 read_minibuf_unwind (data)
      Lisp_Object data;
 {
+  /* We are exiting the minibuffer one way or the other,
+     so run the hook.  */
+  if (!NILP (Vminibuffer_exit_hook) && !EQ (Vminibuffer_exit_hook, Qunbound)
+      && !NILP (Vrun_hooks))
+    call1 (Vrun_hooks, Qminibuffer_exit_hook);
+
   /* Erase the minibuffer we were using at this level.  */
   Fset_buffer (XWINDOW (minibuf_window)->buffer);