From: Michael Albinus <michael.albinus@gmx.de>
Date: Mon, 1 Oct 2018 12:17:27 +0000 (+0200)
Subject: Comple fix for Bug#32550
X-Git-Tag: emacs-26.1.90~116
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=508c40ef1dd625b9c9a58c863995ed241f4a5184;p=emacs.git

Comple fix for Bug#32550

* lisp/net/tramp.el (tramp-rfn-eshadow-update-overlay):
Use `save-excursion'.  This completes the fix of Bug#32550.
---

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)