aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2014-02-08 14:35:15 +0100
committerMichael Albinus2014-02-08 14:35:15 +0100
commit429b93bd7bc5d2145afdc686416ccc7c817e5a33 (patch)
treeb0aa504768e7f9d7614ad2c3259c1dd6c14b18d6
parent54dd147ac382d97eb56672dec8e4e4993f80a343 (diff)
downloademacs-429b93bd7bc5d2145afdc686416ccc7c817e5a33.tar.gz
emacs-429b93bd7bc5d2145afdc686416ccc7c817e5a33.zip
* net/tramp-sh.el (tramp-sh-handle-start-file-process):
Insert output at end of buffer. (Bug#16120)
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/tramp-sh.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0ddce4d9d2d..b17f6abfe0a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-02-08 Michael Albinus <michael.albinus@gmx.de>
2
3 * net/tramp-sh.el (tramp-sh-handle-start-file-process):
4 Insert output at end of buffer. (Bug#16120)
5
12014-02-08 Lars Ingebrigtsen <larsi@gnus.org> 62014-02-08 Lars Ingebrigtsen <larsi@gnus.org>
2 7
3 * simple.el (choose-completion-string-functions): Document new 8 * simple.el (choose-completion-string-functions): Document new
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index d6486de797f..8d3c4c2c58b 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -2758,7 +2758,7 @@ the result will be a local, non-Tramp, filename."
2758 ;; `verify-visited-file-modtime'. 2758 ;; `verify-visited-file-modtime'.
2759 (let ((buffer-undo-list t) 2759 (let ((buffer-undo-list t)
2760 (buffer-read-only nil) 2760 (buffer-read-only nil)
2761 (mark (point))) 2761 (mark (point-max)))
2762 (clear-visited-file-modtime) 2762 (clear-visited-file-modtime)
2763 (narrow-to-region (point-max) (point-max)) 2763 (narrow-to-region (point-max) (point-max))
2764 ;; We call `tramp-maybe-open-connection', in order 2764 ;; We call `tramp-maybe-open-connection', in order