diff --git a/src/ChangeLog b/src/ChangeLog
index 70d32d7126d..84017d4a422 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-05  Gerd Moellmann  <gerd@gnu.org>
+
+	* minibuf.c (read_minibuf): Clean up the binding stack if
+	called noninteractively.
+
 2001-03-05  Kenichi Handa  <handa@etl.go.jp>
 
 	* coding.c (syms_of_coding): Docstring modified.
diff --git a/src/minibuf.c b/src/minibuf.c
index a5e8bf8369e..17302866520 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -397,9 +397,12 @@ read_minibuf (map, initial, prompt, backup_n, expflag,
     }
 
   if (noninteractive)
-    return read_minibuf_noninteractive (map, initial, prompt, backup_n,
-					expflag, histvar, histpos, defalt,
-					allow_props, inherit_input_method);
+    {
+      val = read_minibuf_noninteractive (map, initial, prompt, backup_n,
+					 expflag, histvar, histpos, defalt,
+					 allow_props, inherit_input_method);
+      return unbind_to (count, val);
+    }
 
   /* Choose the minibuffer window and frame, and take action on them.  */