diff options
| author | Michael Albinus | 2013-11-16 12:37:45 +0100 |
|---|---|---|
| committer | Michael Albinus | 2013-11-16 12:37:45 +0100 |
| commit | 355204ddd5525864764003675651cc17ad3280eb (patch) | |
| tree | fd5d70f02f63d5de0d56160f693ebe7db1b754a5 | |
| parent | d17f4dba9c497179ace6c1076fbd636c1c9a86c4 (diff) | |
| download | emacs-355204ddd5525864764003675651cc17ad3280eb.tar.gz emacs-355204ddd5525864764003675651cc17ad3280eb.zip | |
* net/tramp-cmds.el (tramp-cleanup-connection): Clean up
`tramp-current-connection'.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/tramp-cmds.el | 4 |
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 @@ | |||
| 1 | 2013-11-16 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * net/tramp-cmds.el (tramp-cleanup-connection): Clean up | ||
| 4 | `tramp-current-connection'. | ||
| 5 | |||
| 1 | 2013-11-15 Dmitry Gutov <dgutov@yandex.ru> | 6 | 2013-11-15 Dmitry Gutov <dgutov@yandex.ru> |
| 2 | 7 | ||
| 3 | * progmodes/ruby-mode.el (ruby-font-lock-keywords): End regexp for | 8 | * 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." | |||
| 85 | ;; Nothing to do. | 85 | ;; Nothing to do. |
| 86 | (message "No Tramp connection found.") | 86 | (message "No Tramp connection found.") |
| 87 | 87 | ||
| 88 | ;; Cleanup `tramp-current-connection'. Otherwise, we would be | ||
| 89 | ;; suppressed in the test suite. | ||
| 90 | (setq tramp-current-connection nil) | ||
| 91 | |||
| 88 | ;; Flush password cache. | 92 | ;; Flush password cache. |
| 89 | (unless keep-password (tramp-clear-passwd vec)) | 93 | (unless keep-password (tramp-clear-passwd vec)) |
| 90 | 94 | ||