comparison lisp/net/tramp.el @ 70020:2578326defd6

* net/tramp.el (tramp-display-shell-command-buffer): New defvar. (tramp-handle-shell-command): Display output buffer only when `tramp-display-shell-command-buffer' is true. (tramp-handle-process-file): Set `tramp-display-shell-command-buffer'.

70019:a186cf26482b

(defvar tramp-async-proc nil
  "Global variable keeping asynchronous process object.
Used in `tramp-handle-shell-command'")

(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
`tramp-end-of-output', followed by another newline."
  ;; Asynchronous processes are far from being perfect.  But it works at least

	      (unless (search-backward "tramp_exit_status " nil t)
		(error "Couldn't find exit status of `%s'" command))
	      (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.
    (message "tramp-handle-shell-command called with non-tramp directory: `%s'"
	     default-directory)

  "Like `process-file' for Tramp files."
  (when infile (error "Implementation does not handle input from file"))
  (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.

(defsubst tramp-make-temp-file ()
  (funcall (if (fboundp 'make-temp-file) 'make-temp-file 'make-temp-name)

70020:2578326defd6

(defvar tramp-async-proc nil
  "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
`tramp-end-of-output', followed by another newline."
  ;; Asynchronous processes are far from being perfect.  But it works at least

	      (unless (search-backward "tramp_exit_status " nil t)
		(error "Couldn't find exit status of `%s'" command))
	      (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.
    (message "tramp-handle-shell-command called with non-tramp directory: `%s'"
	     default-directory)

  "Like `process-file' for Tramp files."
  (when infile (error "Implementation does not handle input from file"))
  (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.

(defsubst tramp-make-temp-file ()
  (funcall (if (fboundp 'make-temp-file) 'make-temp-file 'make-temp-name)