]> git.eshelyaron.com Git - emacs.git/commitdiff
* net/tramp-cache.el (tramp-dump-connection-properties): Polish
authorMichael Albinus <michael.albinus@gmx.de>
Thu, 4 Dec 2008 20:42:29 +0000 (20:42 +0000)
committerMichael Albinus <michael.albinus@gmx.de>
Thu, 4 Dec 2008 20:42:29 +0000 (20:42 +0000)
the check, whether to dump the data.

lisp/net/tramp-cache.el

index 466cd7f5a41b5632904fdb2d0e2cff01f0e0c9d6..f0ba15548f93a81893870166bdfbc3154ec560f3 100644 (file)
@@ -251,40 +251,40 @@ KEY identifies the connection, it is either a process or a vector."
 (defun tramp-dump-connection-properties ()
   "Write persistent connection properties into file `tramp-persistency-file-name'."
   ;; We shouldn't fail, otherwise (X)Emacs might not be able to be closed.
-  (when tramp-cache-data-changed
-    (condition-case nil
-       (when (and (hash-table-p tramp-cache-data)
-                  (not (zerop (hash-table-count tramp-cache-data)))
-                  (stringp tramp-persistency-file-name))
-         (let ((cache (copy-hash-table tramp-cache-data)))
-           ;; Remove temporary data.
-           (maphash
-            '(lambda (key value)
-               (if (and (vectorp key) (not (tramp-file-name-localname key)))
-                   (progn
-                     (remhash "process-name" value)
-                     (remhash "process-buffer" value))
-                 (remhash key cache)))
-            cache)
-           ;; Dump it.
-           (with-temp-buffer
-             (insert
-              ";; -*- emacs-lisp -*-"
-              ;; `time-stamp-string' might not exist in all (X)Emacs flavors.
-              (condition-case nil
-                  (progn
-                    (format
-                     " <%s %s>\n"
-                     (time-stamp-string "%02y/%02m/%02d %02H:%02M:%02S")
-                     tramp-persistency-file-name))
-                (error "\n"))
-              ";; Tramp connection history.  Don't change this file.\n"
-              ";; You can delete it, forcing Tramp to reapply the checks.\n\n"
-              (with-output-to-string
-                (pp (read (format "(%s)" (tramp-cache-print cache))))))
-             (write-region
-              (point-min) (point-max) tramp-persistency-file-name))))
-      (error nil))))
+  (condition-case nil
+      (when (and (hash-table-p tramp-cache-data)
+                (not (zerop (hash-table-count tramp-cache-data)))
+                tramp-cache-data-changed
+                (stringp tramp-persistency-file-name))
+       (let ((cache (copy-hash-table tramp-cache-data)))
+         ;; Remove temporary data.
+         (maphash
+          '(lambda (key value)
+             (if (and (vectorp key) (not (tramp-file-name-localname key)))
+                 (progn
+                   (remhash "process-name" value)
+                   (remhash "process-buffer" value))
+               (remhash key cache)))
+          cache)
+         ;; Dump it.
+         (with-temp-buffer
+           (insert
+            ";; -*- emacs-lisp -*-"
+            ;; `time-stamp-string' might not exist in all (X)Emacs flavors.
+            (condition-case nil
+                (progn
+                  (format
+                   " <%s %s>\n"
+                   (time-stamp-string "%02y/%02m/%02d %02H:%02M:%02S")
+                   tramp-persistency-file-name))
+              (error "\n"))
+            ";; Tramp connection history.  Don't change this file.\n"
+            ";; You can delete it, forcing Tramp to reapply the checks.\n\n"
+            (with-output-to-string
+              (pp (read (format "(%s)" (tramp-cache-print cache))))))
+           (write-region
+            (point-min) (point-max) tramp-persistency-file-name))))
+    (error nil)))
 
 (add-hook 'kill-emacs-hook 'tramp-dump-connection-properties)
 (add-hook 'tramp-cache-unload-hook