Commit c24e1160 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(read_minibuf_unwind): Preserve Vdeactivate_mark.

parent 2aa8cc2d
...@@ -358,6 +358,8 @@ void ...@@ -358,6 +358,8 @@ void
read_minibuf_unwind (data) read_minibuf_unwind (data)
Lisp_Object data; Lisp_Object data;
{ {
Lisp_Object old_deactivate_mark;
/* We are exiting the minibuffer one way or the other, /* We are exiting the minibuffer one way or the other,
so run the hook. */ so run the hook. */
if (!NILP (Vminibuffer_exit_hook) && !EQ (Vminibuffer_exit_hook, Qunbound) if (!NILP (Vminibuffer_exit_hook) && !EQ (Vminibuffer_exit_hook, Qunbound)
...@@ -369,7 +371,10 @@ read_minibuf_unwind (data) ...@@ -369,7 +371,10 @@ read_minibuf_unwind (data)
/* Prevent error in erase-buffer. */ /* Prevent error in erase-buffer. */
current_buffer->read_only = Qnil; current_buffer->read_only = Qnil;
old_deactivate_mark = Vdeactivate_mark;
Ferase_buffer (); Ferase_buffer ();
Vdeactivate_mark = old_deactivate_mark;
/* If this was a recursive minibuffer, /* If this was a recursive minibuffer,
tie the minibuffer window back to the outer level minibuffer buffer */ tie the minibuffer window back to the outer level minibuffer buffer */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment