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 @@
+2000-10-31  Miles Bader  <miles@lsi.nec.co.jp>
+
+        * minibuf.c (read_minibuf): Reset the undo history just before
+        starting the recursive-edit.
+
 2000-10-30  Gerd Moellmann  <gerd@gnu.org>
 
         * 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,
       && !NILP (Vrun_hooks))
     call1 (Vrun_hooks, Qminibuffer_setup_hook);
 
+  /* Don't allow the user to undo past this point.  */
+  current_buffer->undo_list = Qnil;
+
   recursive_edit_1 ();
 
   /* If cursor is on the minibuffer line,