aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl Heuer1994-12-06 00:19:09 +0000
committerKarl Heuer1994-12-06 00:19:09 +0000
commitcf18c844a94fc880d3b476f55bbd8301673ba2d8 (patch)
treef5b9ba601c9c02e2ebe1c171ec42e91a94fe8b59
parent19993c5484d50310edb40d444e950e12ea8a501f (diff)
downloademacs-cf18c844a94fc880d3b476f55bbd8301673ba2d8.tar.gz
emacs-cf18c844a94fc880d3b476f55bbd8301673ba2d8.zip
(ange-ftp-set-binary-mode): Ignore hash size if nil.
(ange-ftp-set-ascii-mode): Likewise.
-rw-r--r--lisp/ange-ftp.el8
1 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ange-ftp.el b/lisp/ange-ftp.el
index f07f1e7e4d1..665aecbaf10 100644
--- a/lisp/ange-ftp.el
+++ b/lisp/ange-ftp.el
@@ -2690,7 +2690,9 @@ this also returns nil."
2690 (ange-ftp-error host user (concat "BINARY failed: " (cdr result))) 2690 (ange-ftp-error host user (concat "BINARY failed: " (cdr result)))
2691 (save-excursion 2691 (save-excursion
2692 (set-buffer (process-buffer (ange-ftp-get-process host user))) 2692 (set-buffer (process-buffer (ange-ftp-get-process host user)))
2693 (setq ange-ftp-hash-mark-unit (ash ange-ftp-binary-hash-mark-size -4)))))) 2693 (and ange-ftp-binary-hash-mark-size
2694 (setq ange-ftp-hash-mark-unit
2695 (ash ange-ftp-binary-hash-mark-size -4)))))))
2694 2696
2695(defun ange-ftp-set-ascii-mode (host user) 2697(defun ange-ftp-set-ascii-mode (host user)
2696 "Tell the ftp process for the given HOST & USER to switch to ascii mode." 2698 "Tell the ftp process for the given HOST & USER to switch to ascii mode."
@@ -2699,7 +2701,9 @@ this also returns nil."
2699 (ange-ftp-error host user (concat "ASCII failed: " (cdr result))) 2701 (ange-ftp-error host user (concat "ASCII failed: " (cdr result)))
2700 (save-excursion 2702 (save-excursion
2701 (set-buffer (process-buffer (ange-ftp-get-process host user))) 2703 (set-buffer (process-buffer (ange-ftp-get-process host user)))
2702 (setq ange-ftp-hash-mark-unit (ash ange-ftp-ascii-hash-mark-size -4)))))) 2704 (and ange-ftp-ascii-hash-mark-size
2705 (setq ange-ftp-hash-mark-unit
2706 (ash ange-ftp-ascii-hash-mark-size -4)))))))
2703 2707
2704(defun ange-ftp-cd (host user dir) 2708(defun ange-ftp-cd (host user dir)
2705 (let ((result (ange-ftp-send-cmd host user (list 'cd dir) "Doing CD"))) 2709 (let ((result (ange-ftp-send-cmd host user (list 'cd dir) "Doing CD")))