* net/tramp.el (tramp-handle-dired-uncache): Flush directory

cache, not only file cache.
(tramp-process-sentinel): New defun.
(tramp-handle-start-file-process): Use it, in order to invalidate
file caches.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c6476ca1df5e4a5b28690d6a2e3a5ef9f784603e..27e66a84f862d9317bcf44d2f0ed200a648bdb3e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-05  Michael Albinus  <michael.albinus@gmx.de>
+
+       * net/tramp.el (tramp-handle-dired-uncache): Flush directory
+       cache, not only file cache.
+       (tramp-process-sentinel): New defun.
+       (tramp-handle-start-file-process): Use it, in order to invalidate
+       file caches.
+
 2010-08-03  Leo  <sdl.web@gmail.com>
 
        * server.el (server-start): Simplify loop.

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index aca0238e5b666fc229134f11bf7ba3908227be7c..65713580b1bd9417f61ce4cb82a99f633ad1e824 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -4234,7 +4234,7 @@ This is like `dired-recursive-delete-directory' for Tramp files."
   ;; DIR-P is valid for XEmacs only.
   (with-parsed-tramp-file-name
       (if (or dir-p (file-directory-p dir)) dir (file-name-directory dir)) nil
-    (tramp-flush-file-property v localname)))
+    (tramp-flush-directory-property v localname)))
 
 ;; Pacify byte-compiler.  The function is needed on XEmacs only.  I'm
 ;; not sure at all that this is the right way to do it, but let's hope
@@ -4503,6 +4503,14 @@ beginning of local filename are not substituted."
   (with-parsed-tramp-file-name default-directory nil
     (tramp-find-executable v command (tramp-get-remote-path v) t)))
 
+(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 "")))))
+
 ;; We use BUFFER also as connection buffer during setup. Because of
 ;; this, its original contents must be saved, and restored once
 ;; connection has been setup.
@@ -4546,11 +4554,12 @@ beginning of local filename are not substituted."
            (unless (process-get (tramp-get-connection-process v) 'remote-tty)
              (tramp-error
               v 'file-error "pty association is not supported for `%s'" name)))
-         ;; Set query flag for this process.
-         (tramp-set-process-query-on-exit-flag
-          (tramp-get-connection-process v) t)
-         ;; Return process.
-         (tramp-get-connection-process v))
+         (let ((p (tramp-get-connection-process v)))
+           ;; Set sentinel and query flag for this process.
+           (set-process-sentinel p 'tramp-process-sentinel)
+           (tramp-set-process-query-on-exit-flag p t)
+           ;; Return process.
+           p))
       ;; Save exit.
       (with-current-buffer (tramp-get-connection-buffer v)
        (if (string-match tramp-temp-buffer-name (buffer-name))