[Emacs-diffs] Changes to emacs/lisp/net/ange-ftp.el

[Richard M. Stallman]

Index: emacs/lisp/net/ange-ftp.el
diff -c emacs/lisp/net/ange-ftp.el:1.50 emacs/lisp/net/ange-ftp.el:1.51
*** emacs/lisp/net/ange-ftp.el:1.50     Mon Jul  7 16:55:38 2003
--- emacs/lisp/net/ange-ftp.el  Sat Aug 16 20:19:18 2003
***************
*** 1469,1482 ****
  ;; 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))))
  
  (defun ange-ftp-set-buffer-mode ()
    "Set correct modes for the current buffer if visiting a remote file."
--- 1469,1483 ----
  ;; 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)
!   (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."