diff options
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 5 |
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 @@ +2012-12-18 Michael Albinus <michael.albinus@gmx.de> + + * net/tramp.el (tramp-error-with-buffer): Give a hint to use + `tramp-cleanup-this-connection', when the process has died. + (Bug#13151) + 2012-12-17 Stefan Monnier <monnier@iro.umontreal.ca> * 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'." (or (and (bufferp buffer) buffer) (and (processp vec-or-proc) (process-buffer vec-or-proc)) (tramp-get-connection-buffer vec-or-proc))) + (when (string-equal fmt-string "Process died") + (message + "%s\n %s" + "Tramp failed to connect. If this happens repeatedly, try" + "`M-x tramp-cleanup-this-connection'")) (sit-for 30)))))) (defmacro with-parsed-tramp-file-name (filename var &rest body) |