[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/net/tramp.el
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/net/tramp.el |
Date: |
Thu, 13 Apr 2006 19:51:05 +0000 |
Index: emacs/lisp/net/tramp.el
diff -u emacs/lisp/net/tramp.el:1.89 emacs/lisp/net/tramp.el:1.90
--- emacs/lisp/net/tramp.el:1.89 Sun Feb 12 20:22:28 2006
+++ emacs/lisp/net/tramp.el Thu Apr 13 19:51:04 2006
@@ -3584,6 +3584,10 @@
"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,7 +3696,8 @@
(skip-chars-forward "^ ")
(setq status (read (current-buffer)))))
(unless (zerop (buffer-size))
- (display-buffer output-buffer))
+ (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,11 +3712,10 @@
(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))
+ (let ((tramp-display-shell-command-buffer display))
+ (shell-command
+ (mapconcat 'tramp-shell-quote-argument (cons program args) " ")
+ buffer)))
;; File Editing.
- [Emacs-diffs] Changes to emacs/lisp/net/tramp.el,
Michael Albinus <=
- [Emacs-diffs] Changes to emacs/lisp/net/tramp.el, Michael Albinus, 2006/04/17
- [Emacs-diffs] Changes to emacs/lisp/net/tramp.el, Juanma Barranquero, 2006/04/18
- [Emacs-diffs] Changes to emacs/lisp/net/tramp.el, Michael Albinus, 2006/04/23
- [Emacs-diffs] Changes to emacs/lisp/net/tramp.el, Michael Albinus, 2006/04/28
- [Emacs-diffs] Changes to emacs/lisp/net/tramp.el, Richard M. Stallman, 2006/04/29