summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2018-10-01 14:17:27 +0200
committerMichael Albinus <michael.albinus@gmx.de>2018-10-01 14:17:27 +0200
commit508c40ef1dd625b9c9a58c863995ed241f4a5184 (patch)
treee6eae56ac46856d73267f2e7523517c145350d2d
parent35b56a24a09792a0e966f861aa01c07ed1826a82 (diff)
downloademacs-508c40ef1dd625b9c9a58c863995ed241f4a5184.tar.gz
Comple fix for Bug#32550
* lisp/net/tramp.el (tramp-rfn-eshadow-update-overlay): Use `save-excursion'. This completes the fix of Bug#32550.
-rw-r--r--lisp/net/tramp.el29
1 files changed, 14 insertions, 15 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 452e70ec353..98ec8415c74 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1941,21 +1941,20 @@ been set up by `rfn-eshadow-setup-minibuffer'."
(minibuffer-prompt-end)))
;; We do not want to send any remote command.
(non-essential t))
- (when
- (tramp-tramp-file-p
- (buffer-substring-no-properties end (point-max)))
- (save-restriction
- (narrow-to-region
- (1+ (or (string-match
- (tramp-rfn-eshadow-update-overlay-regexp)
- (buffer-string) end)
- end))
- (point-max))
- (let ((rfn-eshadow-overlay tramp-rfn-eshadow-overlay)
- (rfn-eshadow-update-overlay-hook nil)
- file-name-handler-alist)
- (move-overlay rfn-eshadow-overlay (point-max) (point-max))
- (rfn-eshadow-update-overlay)))))))
+ (when (tramp-tramp-file-p (buffer-substring end (point-max)))
+ (save-excursion
+ (save-restriction
+ (narrow-to-region
+ (1+ (or (string-match
+ (tramp-rfn-eshadow-update-overlay-regexp)
+ (buffer-string) end)
+ end))
+ (point-max))
+ (let ((rfn-eshadow-overlay tramp-rfn-eshadow-overlay)
+ (rfn-eshadow-update-overlay-hook nil)
+ file-name-handler-alist)
+ (move-overlay rfn-eshadow-overlay (point-max) (point-max))
+ (rfn-eshadow-update-overlay))))))))
(add-hook 'rfn-eshadow-update-overlay-hook
'tramp-rfn-eshadow-update-overlay)