From 2b93080a4612087cee8453b5ac3c488fd0543754 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sun, 18 Oct 2009 00:46:49 +0000 Subject: [PATCH] (ange-ftp-file-size): Use unwind-protect. --- lisp/ChangeLog | 4 ++++ lisp/net/ange-ftp.el | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 959b20b9273..f6eaf0ff04f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2009-10-18 Stefan Monnier + + * net/ange-ftp.el (ange-ftp-file-size): Use unwind-protect. + 2009-10-18 Glenn Morris * Makefile.in (compile-last): Ensure GREP_OPTIONS is null before calling diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index 6f1958821b8..38b1646f452 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -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))) -- 2.11.4.GIT