[Emacs-diffs] emacs/lisp ChangeLog net/ange-ftp.el

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/10/18 00:46:52

Modified files:
        lisp           : ChangeLog 
        lisp/net       : ange-ftp.el 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16453&r2=1.16454
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/net/ange-ftp.el?cvsroot=emacs&r1=1.113&r2=1.114

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16453
retrieving revision 1.16454
diff -u -b -r1.16453 -r1.16454
--- ChangeLog   18 Oct 2009 00:34:47 -0000      1.16453
+++ ChangeLog   18 Oct 2009 00:46:49 -0000      1.16454
@@ -1,3 +1,7 @@
+2009-10-18  Stefan Monnier  <address@hidden>
+
+       * net/ange-ftp.el (ange-ftp-file-size): Use unwind-protect.
+
 2009-10-18  Glenn Morris  <address@hidden>
 
        * Makefile.in (compile-last): Ensure GREP_OPTIONS is null before calling

Index: net/ange-ftp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/ange-ftp.el,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -b -r1.113 -r1.114
--- net/ange-ftp.el     16 Oct 2009 15:20:58 -0000      1.113
+++ net/ange-ftp.el     18 Oct 2009 00:46:52 -0000      1.114
@@ -3570,10 +3570,11 @@
         ;; Transfer complete" before the "213 SIZE".  Let's skip
         ;; that.
         (ange-ftp-skip-msgs (concat ange-ftp-skip-msgs "\\|^226"))
-        (res (prog2
+        (res (unwind-protect
+                  (progn
                  (unless ascii-mode
                    (ange-ftp-set-binary-mode host user))
-                 (ange-ftp-send-cmd host user (list 'quote "size" name))
+                    (ange-ftp-send-cmd host user (list 'quote "size" name)))
                (unless ascii-mode
                  (ange-ftp-set-ascii-mode host user))))
         (line (cdr res)))