Merge from emacs-24; up to 2014-06-08T18:27:22Z!eggert@cs.ucla.edu

[bpt/emacs.git] / lisp / net / tramp-sh.el

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index a6771cd..68f1ef4 100644 (file)
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -2994,13 +2994,13 @@ the result will be a local, non-Tramp, file name."
                                   command)
                         t t)
                        0 1))
-           ;; We should show the output anyway.
+           ;; We should add the output anyway.
            (when outbuf
              (with-current-buffer outbuf
                 (insert
                  (with-current-buffer (tramp-get-connection-buffer v)
                    (buffer-string))))
-             (when display (display-buffer outbuf))))
+             (when (and display (get-buffer-window outbuf t)) (redisplay))))
        ;; When the user did interrupt, we should do it also.  We use
        ;; return code -1 as marker.
        (quit