aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiles Bader2000-10-31 06:37:58 +0000
committerMiles Bader2000-10-31 06:37:58 +0000
commit4e6b7204855fe4f44b88fed496916b3edac4ba7c (patch)
tree787ef70586fe2df4a60d315b12dbdbc7e3588c8c
parentdfc064f2b58b50b4c77f6c68b0f2ad8e2d51dc7f (diff)
downloademacs-4e6b7204855fe4f44b88fed496916b3edac4ba7c.tar.gz
emacs-4e6b7204855fe4f44b88fed496916b3edac4ba7c.zip
(read_minibuf): Reset the undo history just before starting the recursive-edit.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/minibuf.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 93ac28eb816..fd0fac81b21 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12000-10-31 Miles Bader <miles@lsi.nec.co.jp>
2
3 * minibuf.c (read_minibuf): Reset the undo history just before
4 starting the recursive-edit.
5
12000-10-30 Gerd Moellmann <gerd@gnu.org> 62000-10-30 Gerd Moellmann <gerd@gnu.org>
2 7
3 * xfaces.c (menu_face_change_count): New variable. 8 * xfaces.c (menu_face_change_count): New variable.
diff --git a/src/minibuf.c b/src/minibuf.c
index 23365c722c8..29788a39467 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -553,6 +553,9 @@ read_minibuf (map, initial, prompt, backup_n, expflag,
553 && !NILP (Vrun_hooks)) 553 && !NILP (Vrun_hooks))
554 call1 (Vrun_hooks, Qminibuffer_setup_hook); 554 call1 (Vrun_hooks, Qminibuffer_setup_hook);
555 555
556 /* Don't allow the user to undo past this point. */
557 current_buffer->undo_list = Qnil;
558
556 recursive_edit_1 (); 559 recursive_edit_1 ();
557 560
558 /* If cursor is on the minibuffer line, 561 /* If cursor is on the minibuffer line,