diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c021cee952f..a77f5728ab5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-15  Miles Bader  <miles@gnu.org>
+
+	* simple.el (display-message-or-buffer): Pass the correct buffer
+	to `display-buffer'.
+
 2001-10-14  Stefan Monnier  <monnier@cs.yale.edu>
 
 	* progmodes/executable.el (executable-binary-suffixes): Make varalias.
diff --git a/lisp/simple.el b/lisp/simple.el
index b80a2bdf273..deb1737f4f9 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1305,7 +1305,8 @@ and only used if a buffer is displayed."
 		   (t
 		    ;; Buffer
 		    (goto-char (point-min))
-		    (display-buffer message not-this-window frame))))))))
+		    (display-buffer (current-buffer)
+				    not-this-window frame))))))))
 
 
 ;; We have a sentinel to prevent insertion of a termination message