*** /tmp/tramp.el.~2~	Thu Apr 13 09:25:51 2006
--- /tmp/tramp.el	Thu Apr 13 09:25:51 2006
***************
*** 3584,3589 ****
--- 3584,3593 ----
    "Global variable keeping asynchronous process object.
  Used in `tramp-handle-shell-command'")
  
+ (defvar tramp-display-shell-command-buffer t
+   "Whether to display output buffer of `shell-command'.
+ This is necessary for handling DISPLAY of `process-file'.")
+ 
  (defun tramp-handle-shell-command (command &optional output-buffer error-buffer)
    "Like `shell-command' for tramp files.
  This will break if COMMAND prints a newline, followed by the value of
***************
*** 3692,3698 ****
  	      (skip-chars-forward "^ ")
  	      (setq status (read (current-buffer)))))
  	  (unless (zerop (buffer-size))
! 	    (display-buffer output-buffer))
  	  status))
      ;; The following is only executed if something strange was
      ;; happening.  Emit a helpful message and do it anyway.
--- 3696,3703 ----
  	      (skip-chars-forward "^ ")
  	      (setq status (read (current-buffer)))))
  	  (unless (zerop (buffer-size))
! 	    (when tramp-display-shell-command-buffer
! 	      (display-buffer output-buffer)))
  	  status))
      ;; The following is only executed if something strange was
      ;; happening.  Emit a helpful message and do it anyway.
***************
*** 3707,3717 ****
    (when (and (numberp buffer) (zerop buffer))
      (error "Implementation does not handle immediate return"))
    (when (consp buffer) (error "Implementation does not handle error files"))
!   (shell-command
!    (mapconcat 'tramp-shell-quote-argument
!               (cons program args)
!               " ")
!    buffer))
  
  ;; File Editing.
  
--- 3712,3721 ----
    (when (and (numberp buffer) (zerop buffer))
      (error "Implementation does not handle immediate return"))
    (when (consp buffer) (error "Implementation does not handle error files"))
!   (let ((tramp-display-shell-command-buffer display))
!     (shell-command
!      (mapconcat 'tramp-shell-quote-argument (cons program args) " ")
!      buffer)))
  
  ;; File Editing.