From: Glenn Morris Date: Sun, 13 Sep 2009 02:09:12 +0000 (+0000) Subject: (url-file): Avoid assignment to free variable `filename'. X-Git-Tag: emacs-pretest-23.1.90~1344 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4f0f48dfc10906f2af1ed35afe8624670f4d7c1a;p=emacs.git (url-file): Avoid assignment to free variable `filename'. --- diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index eddc27b09c7..fa6ce1945b1 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -1,3 +1,7 @@ +2009-09-13 Glenn Morris + + * url-file.el (url-file): Avoid assignment to free variable `filename'. + 2009-09-12 Chong Yidong * url-methods.el (url-scheme--registering-proxy): New variable. diff --git a/lisp/url/url-file.el b/lisp/url/url-file.el index e58da0e302a..f0808a34872 100644 --- a/lisp/url/url-file.el +++ b/lisp/url/url-file.el @@ -156,13 +156,9 @@ to them." (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)