comparison lisp/net/tramp.el @ 95963:a20bb74ebe03

* net/tramp.el (tramp-handle-start-file-process): Clear modification time of the connection buffer. (tramp-sh-file-name-handler): Reset `tramp-locked' in case of error.

95962:59534766a799

	  (tramp-set-connection-property
	   v "process-buffer"
	   ;; BUFFER can be nil.
	   (get-buffer-create (or buffer (current-buffer))))
	  ;; Activate narrowing in order to save BUFFER contents.
	  (with-current-buffer (tramp-get-connection-buffer v)
	    (narrow-to-region (point-max) (point-max)))
	  ;; Goto working directory.  `tramp-send-command' opens a new
	  ;; connection.
	  (tramp-send-command
	   v (format "cd %s" (tramp-shell-quote-argument localname)))

(defun tramp-sh-file-name-handler (operation &rest args)
  "Invoke remote-shell Tramp file name handler.
Fall back to normal file name handler if no Tramp handler exists."
  (when (and tramp-locked (not tramp-locker))
    (signal 'file-error (list "Forbidden reentrant call of Tramp")))
  (let ((tl tramp-locked))
    (unwind-protect
	(progn
	  (setq tramp-locked t)

;; * Reconnect directly to a compliant shell without first going
;;   through the user's default shell. (Pete Forman)
;; * Make `tramp-default-user' obsolete.
;; * Tramp shall reconnect automatically to its ssh connection when it
;;   detects that the process "has died". (David Reitter)

;; Functions for file-name-handler-alist:
;; diff-latest-backup-file -- in diff.el
;; dired-uncache -- this will be needed when we do insert-directory caching
;; file-name-as-directory -- use primitive?

95963:a20bb74ebe03

	  (tramp-set-connection-property
	   v "process-buffer"
	   ;; BUFFER can be nil.
	   (get-buffer-create (or buffer (current-buffer))))
	  ;; Activate narrowing in order to save BUFFER contents.
	  ;; Clear also the modification time; otherwise we might be
	  ;; interrupted by `verify-visited-file-modtime'.
	  (with-current-buffer (tramp-get-connection-buffer v)
	    (clear-visited-file-modtime)
	    (narrow-to-region (point-max) (point-max)))
	  ;; Goto working directory.  `tramp-send-command' opens a new
	  ;; connection.
	  (tramp-send-command
	   v (format "cd %s" (tramp-shell-quote-argument localname)))

(defun tramp-sh-file-name-handler (operation &rest args)
  "Invoke remote-shell Tramp file name handler.
Fall back to normal file name handler if no Tramp handler exists."
  (when (and tramp-locked (not tramp-locker))
    (setq tramp-locked nil)
    (signal 'file-error (list "Forbidden reentrant call of Tramp")))
  (let ((tl tramp-locked))
    (unwind-protect
	(progn
	  (setq tramp-locked t)

;; * Reconnect directly to a compliant shell without first going
;;   through the user's default shell. (Pete Forman)
;; * Make `tramp-default-user' obsolete.
;; * Tramp shall reconnect automatically to its ssh connection when it
;;   detects that the process "has died". (David Reitter)
;; * How can I interrupt the remote process with a signal
;;   (interrupt-process seems not to work)? (Markus Triska)

;; Functions for file-name-handler-alist:
;; diff-latest-backup-file -- in diff.el
;; dired-uncache -- this will be needed when we do insert-directory caching
;; file-name-as-directory -- use primitive?