aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKatsumi Yamaoka2007-10-18 22:49:05 +0000
committerKatsumi Yamaoka2007-10-18 22:49:05 +0000
commitbd3164743080f3eb5fc316aca7cc5322ca58fe33 (patch)
treebb49236dbaddfeb2058ca0d7f13892a92d8cb490
parent3278f20eee991e78086bb3b93391ccf68001f586 (diff)
downloademacs-bd3164743080f3eb5fc316aca7cc5322ca58fe33.tar.gz
emacs-bd3164743080f3eb5fc316aca7cc5322ca58fe33.zip
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'.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/tramp.el13
2 files changed, 12 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eabf820754c..d4363b03818 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12007-10-18 Johan Bockg,Ae(Brd <bojohan@gnu.org>
2
3 * net/tramp.el (tramp-rfn-eshadow-update-overlay): Save excursion.
4 Use `save-restriction' rather than `widen'.
5
12007-10-18 Richard Stallman <rms@gnu.org> 62007-10-18 Richard Stallman <rms@gnu.org>
2 7
3 * time.el (display-time-world-time-format): Display day # not month #. 8 * 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'."
2092 (symbol-value 'rfn-eshadow-overlay)) 2092 (symbol-value 'rfn-eshadow-overlay))
2093 (funcall (symbol-function 'minibuffer-prompt-end))))) 2093 (funcall (symbol-function 'minibuffer-prompt-end)))))
2094 (when (file-remote-p (buffer-substring-no-properties end (point-max))) 2094 (when (file-remote-p (buffer-substring-no-properties end (point-max)))
2095 (narrow-to-region 2095 (save-excursion
2096 (1+ (or (string-match "/" (buffer-string) end) end)) (point-max)) 2096 (save-restriction
2097 (let ((rfn-eshadow-overlay tramp-rfn-eshadow-overlay) 2097 (narrow-to-region
2098 (rfn-eshadow-update-overlay-hook nil)) 2098 (1+ (or (string-match "/" (buffer-string) end) end)) (point-max))
2099 (funcall (symbol-function 'rfn-eshadow-update-overlay))) 2099 (let ((rfn-eshadow-overlay tramp-rfn-eshadow-overlay)
2100 (widen)))) 2100 (rfn-eshadow-update-overlay-hook nil))
2101 (funcall (symbol-function 'rfn-eshadow-update-overlay))))))))
2101 2102
2102(when (boundp 'rfn-eshadow-update-overlay-hook) 2103(when (boundp 'rfn-eshadow-update-overlay-hook)
2103 (add-hook 'rfn-eshadow-update-overlay-hook 2104 (add-hook 'rfn-eshadow-update-overlay-hook