aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2016-08-02 22:38:03 +0200
committerMichael Albinus2016-08-02 22:38:03 +0200
commit508349920555ac02dcba71c4d4c60c5a6bb509b6 (patch)
treed5198f9afe7bcc2ffbdd2b1c6d90f67884eccfa3
parent0100805af1e0ed65a07fa0630788d545c304755b (diff)
downloademacs-508349920555ac02dcba71c4d4c60c5a6bb509b6.tar.gz
emacs-508349920555ac02dcba71c4d4c60c5a6bb509b6.zip
Fix Bug#23883
* lisp/net/tramp-sh.el (tramp-maybe-open-connection): Call `process-actions' with adapted position. The connection buffer might have been cleaned up already. (Bug#23883)
-rw-r--r--lisp/net/tramp-sh.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index abfd56eb926..62bf1a6c081 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -4853,7 +4853,10 @@ connection if a previous connection has died for some reason."
4853 (tramp-message vec 3 "Sending command `%s'" command) 4853 (tramp-message vec 3 "Sending command `%s'" command)
4854 (tramp-send-command vec command t t) 4854 (tramp-send-command vec command t t)
4855 (tramp-process-actions 4855 (tramp-process-actions
4856 p vec pos tramp-actions-before-shell 4856 p vec
4857 (min
4858 pos (with-current-buffer (process-buffer p) (point-max)))
4859 tramp-actions-before-shell
4857 (or connection-timeout tramp-connection-timeout)) 4860 (or connection-timeout tramp-connection-timeout))
4858 (tramp-message 4861 (tramp-message
4859 vec 3 "Found remote shell prompt on `%s'" l-host)) 4862 vec 3 "Found remote shell prompt on `%s'" l-host))