* net/tramp-adb.el (tramp-adb-handle-process-file):

* net/tramp-sh.el (tramp-sh-handle-process-file):
* net/tramp-smb.el (tramp-smb-handle-process-file): Do not raise
the output buffer when DISPLAY is non-nil.

Fixes: debbugs:17815

4 files changed, 13 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 88a85c3bda6..e0aaa182785 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2014-06-22  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-adb.el (tramp-adb-handle-process-file):
+        * net/tramp-sh.el (tramp-sh-handle-process-file):
+        * net/tramp-smb.el (tramp-smb-handle-process-file): Do not raise
+        the output buffer when DISPLAY is non-nil.  (Bug#17815)
+
 2014-06-21  Glenn Morris  <rgm@gnu.org>
 
         * play/landmark.el (landmark-move-down, landmark-move-up):
diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el
index 53888473217..c21f2907720 100644
--- a/lisp/net/tramp-adb.el
+++ b/lisp/net/tramp-adb.el
@@ -801,11 +801,11 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored."
              v (format "(cd %s; %s)"
                        (tramp-shell-quote-argument localname) command)
              "")
-            ;; We should show the output anyway.
+            ;; We should add the output anyway.
             (when outbuf
               (with-current-buffer outbuf
                 (insert-buffer-substring (tramp-get-connection-buffer v)))
-              (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
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 15aa1329817..6f55b86e9e5 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -2906,13 +2906,13 @@ the result will be a local, non-Tramp, filename."
                                    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
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index 43e2c494ece..fa5e72dfb3e 100644
--- a/lisp/net/tramp-smb.el
+++ b/lisp/net/tramp-smb.el
@@ -1224,8 +1224,8 @@ target of the symlink differ."
         (error
          (setq ret 1)))
 
-      ;; We should show the output anyway.
-      (when (and outbuf display) (display-buffer outbuf))
+      ;; We should redisplay the output.
+      (when (and display outbuf (get-buffer-window outbuf t)) (redisplay))
 
       ;; Cleanup.  We remove all file cache values for the connection,
       ;; because the remote process could have changed them.