aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman1994-09-24 01:41:54 +0000
committerRichard M. Stallman1994-09-24 01:41:54 +0000
commitc24e1160ff40c156e0d0a7b9f7ab89587bd11111 (patch)
tree76a92f3991ee78cccd90b4600aa43a730c8210bb /src
parent2aa8cc2dc5bd6a1e2ec58efee520c3658ff315f4 (diff)
downloademacs-c24e1160ff40c156e0d0a7b9f7ab89587bd11111.tar.gz
emacs-c24e1160ff40c156e0d0a7b9f7ab89587bd11111.zip
(read_minibuf_unwind): Preserve Vdeactivate_mark.
Diffstat (limited to 'src')
-rw-r--r--src/minibuf.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/minibuf.c b/src/minibuf.c
index 3654c01d845..d5f75bd35b7 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -358,6 +358,8 @@ void
358read_minibuf_unwind (data) 358read_minibuf_unwind (data)
359 Lisp_Object data; 359 Lisp_Object data;
360{ 360{
361 Lisp_Object old_deactivate_mark;
362
361 /* We are exiting the minibuffer one way or the other, 363 /* We are exiting the minibuffer one way or the other,
362 so run the hook. */ 364 so run the hook. */
363 if (!NILP (Vminibuffer_exit_hook) && !EQ (Vminibuffer_exit_hook, Qunbound) 365 if (!NILP (Vminibuffer_exit_hook) && !EQ (Vminibuffer_exit_hook, Qunbound)
@@ -369,7 +371,10 @@ read_minibuf_unwind (data)
369 371
370 /* Prevent error in erase-buffer. */ 372 /* Prevent error in erase-buffer. */
371 current_buffer->read_only = Qnil; 373 current_buffer->read_only = Qnil;
374
375 old_deactivate_mark = Vdeactivate_mark;
372 Ferase_buffer (); 376 Ferase_buffer ();
377 Vdeactivate_mark = old_deactivate_mark;
373 378
374 /* If this was a recursive minibuffer, 379 /* If this was a recursive minibuffer,
375 tie the minibuffer window back to the outer level minibuffer buffer */ 380 tie the minibuffer window back to the outer level minibuffer buffer */