[Emacs-diffs] Changes to emacs/lisp/simple.el

[Richard M. Stallman]

Index: emacs/lisp/simple.el
diff -c emacs/lisp/simple.el:1.552 emacs/lisp/simple.el:1.553
*** emacs/lisp/simple.el:1.552  Mon Jun 17 12:15:09 2002
--- emacs/lisp/simple.el        Wed Jun 26 04:59:32 2002
***************
*** 1264,1270 ****
        ;; Output goes in a separate buffer.
        ;; Preserve the match data in case called from a program.
        (save-match-data
!         (if (string-match "[ \t]*&[ \t]*$" command)
              ;; Command ending with ampersand means asynchronous.
              (let ((buffer (get-buffer-create
                             (or output-buffer "*Async Shell Command*")))
--- 1264,1270 ----
        ;; Output goes in a separate buffer.
        ;; Preserve the match data in case called from a program.
        (save-match-data
!         (if (string-match "[ \t]*&[ \t]*\\'" command)
              ;; Command ending with ampersand means asynchronous.
              (let ((buffer (get-buffer-create
                             (or output-buffer "*Async Shell Command*")))
***************
*** 1335,1351 ****
                  (if (= (buffer-size) 0)
                      0
                    (count-lines (point-min) (point-max)))))
!            (cond ((or (<= lines 1)
!                       (<= lines
!                           (if resize-mini-windows
!                               (cond ((floatp max-mini-window-height)
!                                      (* (frame-height)
!                                         max-mini-window-height))
!                                     ((integerp max-mini-window-height)
!                                      max-mini-window-height)
!                                     (t
!                                      1))
!                             1)))
                    ;; Echo area
                    (goto-char (point-max))
                    (when (bolp)
--- 1335,1354 ----
                  (if (= (buffer-size) 0)
                      0
                    (count-lines (point-min) (point-max)))))
!            (cond ((and (or (<= lines 1)
!                            (<= lines
!                                (if resize-mini-windows
!                                    (cond ((floatp max-mini-window-height)
!                                           (* (frame-height)
!                                              max-mini-window-height))
!                                          ((integerp max-mini-window-height)
!                                           max-mini-window-height)
!                                          (t
!                                           1))
!                                  1)))
!                        ;; Don't use the echo area if the output buffer is
!                        ;; already dispayed in the selected frame.
!                        (not (get-buffer-window buffer)))
                    ;; Echo area
                    (goto-char (point-max))
                    (when (bolp)