diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 13 | ||||
| -rw-r--r-- | lisp/comint.el | 3 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 9 |
3 files changed, 21 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4e09f857af0..b5d7984c04f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,16 @@ +2010-08-06 Michael Albinus <michael.albinus@gmx.de> + + * net/tramp.el (tramp-handle-start-file-process ): Set connection + property "vec". + (tramp-process-sentinel): Use it for flushing the cache. We + cannot do it via the process buffer, the buffer could be deleted + already when running the sentinel. + +2010-08-06 Jürgen Hötzel <juergen@archlinux.org> (tiny change) + + * comint.el (comint-mode): Make directory tracking functions + functional on remote files. (Bug#6764) + 2010-08-06 Dan Nicolaescu <dann@ics.uci.edu> * vc/diff-mode.el (diff-mode-shared-map): Bind g to revert-buffer. diff --git a/lisp/comint.el b/lisp/comint.el index 071537ffd89..128965fc11f 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -674,6 +674,9 @@ Entry to this mode runs the hooks on `comint-mode-hook'." (make-local-variable 'comint-process-echoes) (make-local-variable 'comint-file-name-chars) (make-local-variable 'comint-file-name-quote-list) + ;; dir tracking on remote files + (set (make-local-variable 'comint-file-name-prefix) + (or (file-remote-p default-directory) "")) (make-local-variable 'comint-accum-marker) (setq comint-accum-marker (make-marker)) (make-local-variable 'font-lock-defaults) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 65713580b1b..a9870823f80 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -4506,10 +4506,10 @@ beginning of local filename are not substituted." (defun tramp-process-sentinel (proc event) "Flush file caches." (unless (memq (process-status proc) '(run open)) - (with-current-buffer (process-buffer proc) - (with-parsed-tramp-file-name default-directory nil - (tramp-message v 5 "Sentinel called: `%s' `%s'" proc event) - (tramp-flush-directory-property v ""))))) + (let ((vec (tramp-get-connection-property proc "vector" nil))) + (when vec + (tramp-message vec 5 "Sentinel called: `%s' `%s'" proc event) + (tramp-flush-directory-property vec ""))))) ;; We use BUFFER also as connection buffer during setup. Because of ;; this, its original contents must be saved, and restored once @@ -4556,6 +4556,7 @@ beginning of local filename are not substituted." v 'file-error "pty association is not supported for `%s'" name))) (let ((p (tramp-get-connection-process v))) ;; Set sentinel and query flag for this process. + (tramp-set-connection-property p "vector" v) (set-process-sentinel p 'tramp-process-sentinel) (tramp-set-process-query-on-exit-flag p t) ;; Return process. |