aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2001-03-05 11:30:18 +0000
committerGerd Moellmann2001-03-05 11:30:18 +0000
commitc28b847bfe2a0551f3c4808bc97d0c7a3198f989 (patch)
treedea149513a91be2decdd9020f31cec70ba2527e1
parent278dd6ac281c40f2e004c92cc1a34a6cc9b7507c (diff)
downloademacs-c28b847bfe2a0551f3c4808bc97d0c7a3198f989.tar.gz
emacs-c28b847bfe2a0551f3c4808bc97d0c7a3198f989.zip
(read_minibuf): Clean up the binding stack if
called noninteractively.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/minibuf.c9
2 files changed, 11 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 70d32d7126d..84017d4a422 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12001-03-05 Gerd Moellmann <gerd@gnu.org>
2
3 * minibuf.c (read_minibuf): Clean up the binding stack if
4 called noninteractively.
5
12001-03-05 Kenichi Handa <handa@etl.go.jp> 62001-03-05 Kenichi Handa <handa@etl.go.jp>
2 7
3 * coding.c (syms_of_coding): Docstring modified. 8 * 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,
397 } 397 }
398 398
399 if (noninteractive) 399 if (noninteractive)
400 return read_minibuf_noninteractive (map, initial, prompt, backup_n, 400 {
401 expflag, histvar, histpos, defalt, 401 val = read_minibuf_noninteractive (map, initial, prompt, backup_n,
402 allow_props, inherit_input_method); 402 expflag, histvar, histpos, defalt,
403 allow_props, inherit_input_method);
404 return unbind_to (count, val);
405 }
403 406
404 /* Choose the minibuffer window and frame, and take action on them. */ 407 /* Choose the minibuffer window and frame, and take action on them. */
405 408