[Emacs-diffs] emacs/lisp/url ChangeLog url-file.el

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/09/13 02:09:12

Modified files:
        lisp/url       : ChangeLog url-file.el 

Log message:
        (url-file): Avoid assignment to free variable `filename'.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/url/ChangeLog?cvsroot=emacs&r1=1.182&r2=1.183
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/url/url-file.el?cvsroot=emacs&r1=1.26&r2=1.27

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/url/ChangeLog,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -b -r1.182 -r1.183
--- ChangeLog   12 Sep 2009 00:47:13 -0000      1.182
+++ ChangeLog   13 Sep 2009 02:09:12 -0000      1.183
@@ -1,3 +1,7 @@
+2009-09-13  Glenn Morris  <address@hidden>
+
+       * url-file.el (url-file): Avoid assignment to free variable `filename'.
+
 2009-09-12  Chong Yidong  <address@hidden>
 
        * url-methods.el (url-scheme--registering-proxy): New variable.

Index: url-file.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/url/url-file.el,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- url-file.el 22 Aug 2009 21:53:34 -0000      1.26
+++ url-file.el 13 Sep 2009 02:09:12 -0000      1.27
@@ -156,13 +156,9 @@
         (uncompressed-filename nil)
         (content-type nil)
         (content-encoding nil)
-        (coding-system-for-read 'binary))
-
-    (setq filename (url-file-build-filename url))
-
-    (if (not filename)
-       (error "File does not exist: %s" (url-recreate-url url)))
-
+        (coding-system-for-read 'binary)
+        (filename (url-file-build-filename url)))
+    (or filename (error "File does not exist: %s" (url-recreate-url url)))
     ;; Need to figure out the content-type from the real extension,
     ;; not the compressed one.
     (setq uncompressed-filename (if (string-match "\\.\\(gz\\|Z\\|z\\)$" 
filename)