summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog10
-rw-r--r--lisp/net/tramp-cmds.el3
2 files changed, 13 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 809ace2bfb9..6d8266efdca 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2008-06-15 Michael Albinus <michael.albinus@gmx.de>
+
+ * net/tramp.el (tramp-handle-start-file-process): Clear
+ modification time of the connection buffer.
+ (tramp-sh-file-name-handler): Reset `tramp-locked' in case of
+ error.
+
+ * net/tramp-cmds.el (tramp-cleanup-all-connections): Reset
+ `tramp-locked'.
+
2008-06-15 Ulf Jasper <ulf@web.de>
* net/newst-treeview.el (newsticker--treeview-list-update)
diff --git a/lisp/net/tramp-cmds.el b/lisp/net/tramp-cmds.el
index fae9e699c05..6acce78c02c 100644
--- a/lisp/net/tramp-cmds.el
+++ b/lisp/net/tramp-cmds.el
@@ -102,6 +102,9 @@ When called interactively, a Tramp connection has to be selected."
This includes password cache, file cache, connection cache, buffers."
(interactive)
+ ;; Unlock Tramp.
+ (setq tramp-locked nil)
+
;; Flush password cache.
(when (functionp 'password-reset)
(funcall (symbol-function 'password-reset)))