summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1995-11-19 18:03:46 +0000
committerRichard M. Stallman <rms@gnu.org>1995-11-19 18:03:46 +0000
commit597cc6bd53e0f5ef7547a1e75da665585c05f5d7 (patch)
treec05c34926c18be91c879084c74e46b13eee25ca4 /lisp
parentc76a2c160b192880057444e064d3861dd4512d48 (diff)
downloademacs-597cc6bd53e0f5ef7547a1e75da665585c05f5d7.tar.gz
(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.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ange-ftp.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/ange-ftp.el b/lisp/ange-ftp.el
index cd43215632e..4ad8564bc70 100644
--- 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)