From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Thu, 18 Oct 2007 22:49:05 +0000 (+0000)
Subject: From_ Johan Bockgrd, <http://article.gmane.org/gmane.emacs.devel/81056>
X-Git-Tag: emacs-pretest-23.0.90~10232
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bd3164743080f3eb5fc316aca7cc5322ca58fe33;p=emacs.git

From_ Johan Bockgrd, <http://article.gmane.org/gmane.emacs.devel/81056>
* net/tramp.el (tramp-rfn-eshadow-update-overlay): Save excursion.
Use `save-restriction' rather than `widen'.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eabf820754c..d4363b03818 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-18  Johan Bockg,Ae(Brd  <bojohan@gnu.org>
+
+	* net/tramp.el (tramp-rfn-eshadow-update-overlay): Save excursion.
+	Use `save-restriction' rather than `widen'.
+
 2007-10-18  Richard Stallman  <rms@gnu.org>
 
 	* time.el (display-time-world-time-format): Display day # not month #.
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index c8b2a72aad0..0af9c457995 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -2092,12 +2092,13 @@ been set up by `rfn-eshadow-setup-minibuffer'."
 			  (symbol-value 'rfn-eshadow-overlay))
 		 (funcall (symbol-function 'minibuffer-prompt-end)))))
     (when (file-remote-p (buffer-substring-no-properties end (point-max)))
-      (narrow-to-region
-       (1+ (or (string-match "/" (buffer-string) end) end)) (point-max))
-      (let ((rfn-eshadow-overlay tramp-rfn-eshadow-overlay)
-	    (rfn-eshadow-update-overlay-hook nil))
-	(funcall (symbol-function 'rfn-eshadow-update-overlay)))
-      (widen))))
+      (save-excursion
+	(save-restriction
+	  (narrow-to-region
+	   (1+ (or (string-match "/" (buffer-string) end) end)) (point-max))
+	  (let ((rfn-eshadow-overlay tramp-rfn-eshadow-overlay)
+		(rfn-eshadow-update-overlay-hook nil))
+	    (funcall (symbol-function 'rfn-eshadow-update-overlay))))))))
 
 (when (boundp 'rfn-eshadow-update-overlay-hook)
   (add-hook 'rfn-eshadow-update-overlay-hook