[Emacs-diffs] trunk r115225: * net/tramp-cmds.el (tramp-cleanup-connection): Clean up

[Michael Albinus]

------------------------------------------------------------
revno: 115225
revision-id: address@hidden
parent: address@hidden
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Mon 2013-11-25 15:51:34 +0100
message:
  * net/tramp-cmds.el (tramp-cleanup-connection): Clean up
  `tramp-current-connection' only when KEEP-PASSWORD is non-nil.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/tramp-cmds.el         
trampcmds.el-20091113204419-o5vbwnq5f7feedwu-7524

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-11-25 14:31:04 +0000
+++ b/lisp/ChangeLog    2013-11-25 14:51:34 +0000
@@ -1,3 +1,8 @@
+2013-11-25  Michael Albinus  <address@hidden>
+
+       * net/tramp-cmds.el (tramp-cleanup-connection): Clean up
+       `tramp-current-connection' only when KEEP-PASSWORD is non-nil.
+
 2013-11-25  Stefan Monnier  <address@hidden>
 
        * play/gomoku.el: Don't use intangible property.  Use lexical-binding.

=== modified file 'lisp/net/tramp-cmds.el'
--- a/lisp/net/tramp-cmds.el    2013-11-16 11:37:45 +0000
+++ b/lisp/net/tramp-cmds.el    2013-11-25 14:51:34 +0000
@@ -85,13 +85,14 @@
       ;; Nothing to do.
       (message "No Tramp connection found.")
 
-    ;; Cleanup `tramp-current-connection'.  Otherwise, we would be
-    ;; suppressed in the test suite.
-    (setq tramp-current-connection nil)
-
     ;; Flush password cache.
     (unless keep-password (tramp-clear-passwd vec))
 
+    ;; Cleanup `tramp-current-connection'.  Otherwise, we would be
+    ;; suppressed in the test suite.  We use `keep-password' as
+    ;; indicator; it is not worth to add a new argument.
+    (when keep-password (setq tramp-current-connection nil))
+
     ;; Flush file cache.
     (tramp-flush-directory-property vec "")