andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(ange-ftp-file-size): Use unwind-protect.

Browse source
This commit is contained in:
Stefan Monnier 2009-10-18 00:46:49 +00:00
parent 18b5ffb503
commit 2b93080a46
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -1,3 +1,7 @@
2009-10-18 Stefan Monnier <monnier@iro.umontreal.ca>
* net/ange-ftp.el (ange-ftp-file-size): Use unwind-protect.
2009-10-18 Glenn Morris <rgm@gnu.org>
* Makefile.in (compile-last): Ensure GREP_OPTIONS is null before calling

9
lisp/net/ange-ftp.el
View file

@ -3570,10 +3570,11 @@ so return the size on the remote host exactly. See RFC 3659."
;; Transfer complete" before the "213 SIZE". Let's skip
;; that.
(ange-ftp-skip-msgs (concat ange-ftp-skip-msgs "\\|^226"))
(res (prog2
(unless ascii-mode
(ange-ftp-set-binary-mode host user))
(ange-ftp-send-cmd host user (list 'quote "size" name))
(res (unwind-protect
(progn
(unless ascii-mode
(ange-ftp-set-binary-mode host user))
(ange-ftp-send-cmd host user (list 'quote "size" name)))
(unless ascii-mode
(ange-ftp-set-ascii-mode host user))))
(line (cdr res)))