aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2012-12-18 14:37:06 +0100
committerMichael Albinus2012-12-18 14:37:06 +0100
commite0d01ef3f862544762cf045a0524bdd062b98f6f (patch)
treef531c3749c1206d2c3b077f3098591dd45f81e96
parent8725c07695e517965f878c4949a5731a48e89a48 (diff)
downloademacs-e0d01ef3f862544762cf045a0524bdd062b98f6f.tar.gz
emacs-e0d01ef3f862544762cf045a0524bdd062b98f6f.zip
* net/tramp.el (tramp-error-with-buffer): Give a hint to use
`tramp-cleanup-this-connection', when the process has died. (Bug#13151)
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/net/tramp.el5
2 files changed, 11 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9d05f2fcc26..39fa4b2ef49 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12012-12-18 Michael Albinus <michael.albinus@gmx.de>
2
3 * net/tramp.el (tramp-error-with-buffer): Give a hint to use
4 `tramp-cleanup-this-connection', when the process has died.
5 (Bug#13151)
6
12012-12-17 Stefan Monnier <monnier@iro.umontreal.ca> 72012-12-17 Stefan Monnier <monnier@iro.umontreal.ca>
2 8
3 * icomplete.el (icomplete-completions): Also use … to truncate prefix. 9 * icomplete.el (icomplete-completions): Also use … to truncate prefix.
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index a4be6eab41f..bc220a33b2a 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1455,6 +1455,11 @@ an input event arrives. The other arguments are passed to `tramp-error'."
1455 (or (and (bufferp buffer) buffer) 1455 (or (and (bufferp buffer) buffer)
1456 (and (processp vec-or-proc) (process-buffer vec-or-proc)) 1456 (and (processp vec-or-proc) (process-buffer vec-or-proc))
1457 (tramp-get-connection-buffer vec-or-proc))) 1457 (tramp-get-connection-buffer vec-or-proc)))
1458 (when (string-equal fmt-string "Process died")
1459 (message
1460 "%s\n %s"
1461 "Tramp failed to connect. If this happens repeatedly, try"
1462 "`M-x tramp-cleanup-this-connection'"))
1458 (sit-for 30)))))) 1463 (sit-for 30))))))
1459 1464
1460(defmacro with-parsed-tramp-file-name (filename var &rest body) 1465(defmacro with-parsed-tramp-file-name (filename var &rest body)