# HG changeset patch # User Jim Blandy # Date 721876829 0 # Node ID 3e621a2a9cfefa9537bde539926e4ff9a87bb9b3 # Parent f0c4c8771cd4e480d09fc22a5e8ea35479c4528a * ange-ftp.el (ange-ftp-repaint-buffer): Give this a non-hacky definition using (message nil). (ange-ftp-read-passwd, ange-ftp-process-filter): Uncomment out the calls to ange-ftp-repaint-buffer. diff -r f0c4c8771cd4 -r 3e621a2a9cfe lisp/ange-ftp.el --- a/lisp/ange-ftp.el Mon Nov 16 01:04:24 1992 +0000 +++ b/lisp/ange-ftp.el Mon Nov 16 01:20:29 1992 +0000 @@ -857,7 +857,7 @@ ;;;; Internal variables. ;;;; ------------------------------------------------------------ -(defconst ange-ftp-version "$Revision: 1.10 $") +(defconst ange-ftp-version "$Revision: 1.11 $") (defvar ange-ftp-data-buffer-name " *ftp data*" "Buffer name to hold directory listing data received from ftp process.") @@ -1017,7 +1017,7 @@ (if (> (length pass) 0) (setq pass (substring pass 0 -1)))))) (message "") -;; (ange-ftp-repaint-minibuffer) + (ange-ftp-repaint-minibuffer) pass)) (defmacro ange-ftp-generate-passwd-key (host user) @@ -1302,20 +1302,9 @@ ;; (setq ange-ftp-tmp-keymap (make-sparse-keymap)) ;; (define-key ange-ftp-tmp-keymap "\C-m" 'exit-minibuffer) -;; (defun ange-ftp-repaint-minibuffer () -;; "Gross hack to set minibuf_message = 0, so that the contents of the -;; minibuffer will show." -;; (if (eq (selected-window) (minibuffer-window)) -;; (if (fboundp 'allocate-event) -;; ;; lemacs -;; (let ((unread-command-event (character-to-event ?\C-m -;; (allocate-event))) -;; (enable-recursive-minibuffers t)) -;; (read-from-minibuffer "" nil ange-ftp-tmp-keymap nil)) -;; ;; v18 GNU Emacs -;; (let ((unread-command-char ?\C-m) -;; (enable-recursive-minibuffers t)) -;; (read-from-minibuffer "" nil ange-ftp-tmp-keymap nil))))) +(defun ange-ftp-repaint-minibuffer () + "Clear any existing minibuffer message; let the minibuffer contents show." + (message nil)) (defun ange-ftp-ftp-process-buffer (host user) "Return the name of the buffer that collects output from the ftp process @@ -1525,7 +1514,7 @@ ange-ftp-process-result) (progn (ange-ftp-message "%s...done" ange-ftp-process-msg) -;; (ange-ftp-repaint-minibuffer) + (ange-ftp-repaint-minibuffer) (setq ange-ftp-process-msg nil))) ;; is there a continuation we should be calling? if so,