aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Rost2004-11-22 06:43:11 +0000
committerMarkus Rost2004-11-22 06:43:11 +0000
commitb0e9bb2895f44b811eca8244bcd14a69f280fb15 (patch)
tree0aed0f90c8106859367c8406d17696dffb6be729
parentd8ac3d271c6ff4377b597006753df7dc074d1b55 (diff)
downloademacs-b0e9bb2895f44b811eca8244bcd14a69f280fb15.tar.gz
emacs-b0e9bb2895f44b811eca8244bcd14a69f280fb15.zip
(Fminibuffer_complete_and_exit): Fix previous change.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/minibuf.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index cd09604d4e2..c13f1cbb4c1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12004-11-22 Markus Rost <rost@ias.edu>
2
3 * minibuf.c (Fminibuffer_complete_and_exit): Fix previous change.
4
12004-11-22 Stefan Monnier <monnier@iro.umontreal.ca> 52004-11-22 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * eval.c (Fdefvar): Warn when var is let-bound but globally void. 7 * eval.c (Fdefvar): Warn when var is let-bound but globally void.
diff --git a/src/minibuf.c b/src/minibuf.c
index fd90a73f8eb..cb302f44c43 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -2105,8 +2105,6 @@ a repetition of this command will exit. */)
2105 goto exit; 2105 goto exit;
2106 } 2106 }
2107 2107
2108 goto exit;
2109
2110 /* Call do_completion, but ignore errors. */ 2108 /* Call do_completion, but ignore errors. */
2111 SET_PT (ZV); 2109 SET_PT (ZV);
2112 val = internal_condition_case (complete_and_exit_1, Qerror, 2110 val = internal_condition_case (complete_and_exit_1, Qerror,