summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2013-11-16 12:37:45 +0100
committerMichael Albinus <michael.albinus@gmx.de>2013-11-16 12:37:45 +0100
commit355204ddd5525864764003675651cc17ad3280eb (patch)
treefd5d70f02f63d5de0d56160f693ebe7db1b754a5 /lisp
parentd17f4dba9c497179ace6c1076fbd636c1c9a86c4 (diff)
downloademacs-355204ddd5525864764003675651cc17ad3280eb.tar.gz
* net/tramp-cmds.el (tramp-cleanup-connection): Clean up
`tramp-current-connection'.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/tramp-cmds.el4
2 files changed, 9 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index aabdbd6b0fc..ce887ff3e11 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-16 Michael Albinus <michael.albinus@gmx.de>
+
+ * net/tramp-cmds.el (tramp-cleanup-connection): Clean up
+ `tramp-current-connection'.
+
2013-11-15 Dmitry Gutov <dgutov@yandex.ru>
* progmodes/ruby-mode.el (ruby-font-lock-keywords): End regexp for
diff --git a/lisp/net/tramp-cmds.el b/lisp/net/tramp-cmds.el
index 2f3dfa4fd7a..35f23caa51a 100644
--- a/lisp/net/tramp-cmds.el
+++ b/lisp/net/tramp-cmds.el
@@ -85,6 +85,10 @@ When called interactively, a Tramp connection has to be selected."
;; 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))