diff options
author | Richard M. Stallman <rms@gnu.org> | 2003-08-17 00:19:18 +0000 |
---|---|---|
committer | Richard M. Stallman <rms@gnu.org> | 2003-08-17 00:19:18 +0000 |
commit | 6df73ca3929f58b55a44c87b4a50771eb0b8057d (patch) | |
tree | a4a8d93be0522a166d70f9c92fc30210ed93b624 /lisp/net/ange-ftp.el | |
parent | 606f5e7543edb11fe55b8c1c4e82bf006b26db6d (diff) | |
download | emacs-6df73ca3929f58b55a44c87b4a50771eb0b8057d.tar.gz |
(ange-ftp-error): Add save-excursion.
Diffstat (limited to 'lisp/net/ange-ftp.el')
-rw-r--r-- | lisp/net/ange-ftp.el | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index a315482fd1e..c7d0ad2d4a9 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -1469,14 +1469,15 @@ only return the directory part of FILE." ;; Display the last chunk of output from the ftp process for the given HOST ;; USER pair, and signal an error including MSG in the text. (defun ange-ftp-error (host user msg) - (let ((cur (selected-window)) - (pop-up-windows t)) - (pop-to-buffer - (get-buffer-create - (ange-ftp-ftp-process-buffer host user))) - (goto-char (point-max)) - (select-window cur)) - (signal 'ftp-error (list (format "FTP Error: %s" msg)))) + (save-excursion ;; Prevent pop-to-buffer from changing current buffer. + (let ((cur (selected-window)) + (pop-up-windows t)) + (pop-to-buffer + (get-buffer-create + (ange-ftp-ftp-process-buffer host user))) + (goto-char (point-max)) + (select-window cur)) + (signal 'ftp-error (list (format "FTP Error: %s" msg))))) (defun ange-ftp-set-buffer-mode () "Set correct modes for the current buffer if visiting a remote file." |