(ange-ftp-process-handle-hash): If

ange-ftp-hash-mark-unit is nil, don't display a message.
(ange-ftp-process-filter): Call ange-ftp-process-handle-hash even
if ange-ftp-hash-mark-unit is nil.

diff --git a/lisp/ange-ftp.el b/lisp/ange-ftp.el
index cd43215632ef92c6e8da6a2d6e5c5adf8f83d7c3..4ad8564bc702748839c0886f0a1bcacf3a3c2128 100644 (file)
--- a/lisp/ange-ftp.el
+++ b/lisp/ange-ftp.el
@@ -1422,7 +1422,8 @@ good, skip, fatal, or unknown."
        ange-ftp-hash-mark-count (+ (- (match-end 0)
                                       (match-beginning 0))
                                    ange-ftp-hash-mark-count))
-  (and ange-ftp-process-msg
+  (and ange-ftp-hash-mark-unit
+       ange-ftp-process-msg
        ange-ftp-process-verbose
        (not (eq (selected-window) (minibuffer-window)))
        (not (boundp 'search-message))  ;screws up isearch otherwise
@@ -1466,8 +1467,7 @@ good, skip, fatal, or unknown."
              (set-buffer (process-buffer proc))
              
              ;; handle hash mark printing
-             (and ange-ftp-hash-mark-unit
-                  ange-ftp-process-busy
+             (and ange-ftp-process-busy
                   (string-match "^#+$" str)
                   (setq str (ange-ftp-process-handle-hash str)))
              (comint-output-filter proc str)