aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schwab2002-06-29 18:13:06 +0000
committerAndreas Schwab2002-06-29 18:13:06 +0000
commit61b80ebf7f608cc2914d706ea4d167598e0d1b10 (patch)
tree9a6d4c37aef2d1eaf04669ac086d0a4f0ae09563
parentd4bbcbb4dc402032c5248357415b0f24ce0c1133 (diff)
downloademacs-61b80ebf7f608cc2914d706ea4d167598e0d1b10.tar.gz
emacs-61b80ebf7f608cc2914d706ea4d167598e0d1b10.zip
(display-message-or-buffer): Fix last change.
-rw-r--r--lisp/ChangeLog1
-rw-r--r--lisp/simple.el2
2 files changed, 2 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 63a07fa7933..85069b254ee 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,7 @@
2 2
3 * simple.el (shell-command-on-region): Handle errors and signals 3 * simple.el (shell-command-on-region): Handle errors and signals
4 from shell command execution. 4 from shell command execution.
5 (display-message-or-buffer): Fix last change.
5 6
6 * dired.el (dired-view-file): Quote file name for 7 * dired.el (dired-view-file): Quote file name for
7 dired-run-shell-command. 8 dired-run-shell-command.
diff --git a/lisp/simple.el b/lisp/simple.el
index 0b91abb8ecb..416b6934f5e 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1348,7 +1348,7 @@ and only used if a buffer is displayed."
1348 1))) 1348 1)))
1349 ;; Don't use the echo area if the output buffer is 1349 ;; Don't use the echo area if the output buffer is
1350 ;; already dispayed in the selected frame. 1350 ;; already dispayed in the selected frame.
1351 (not (get-buffer-window buffer))) 1351 (not (get-buffer-window (current-buffer))))
1352 ;; Echo area 1352 ;; Echo area
1353 (goto-char (point-max)) 1353 (goto-char (point-max))
1354 (when (bolp) 1354 (when (bolp)