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

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/02/10 03:27:29

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

Log message:
        (url-generate-unique-filename): Silence compiler.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/url/ChangeLog?cvsroot=emacs&r1=1.176&r2=1.177
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/url/url-util.el?cvsroot=emacs&r1=1.31&r2=1.32

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/url/ChangeLog,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -b -r1.176 -r1.177
--- ChangeLog   7 Feb 2009 21:21:38 -0000       1.176
+++ ChangeLog   10 Feb 2009 03:27:29 -0000      1.177
@@ -1,3 +1,7 @@
+2009-02-10  Glenn Morris  <address@hidden>
+
+       * url-util.el (url-generate-unique-filename): Silence compiler.
+
 2009-02-07  Chong Yidong  <address@hidden>
 
        * url-file.el (url-file): Use make-temp-file.

Index: url-util.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/url/url-util.el,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- url-util.el 7 Feb 2009 21:22:34 -0000       1.31
+++ url-util.el 10 Feb 2009 03:27:29 -0000      1.32
@@ -1,7 +1,7 @@
 ;;; url-util.el --- Miscellaneous helper routines for URL library
 
-;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004,
-;;   2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004, 2005, 2006, 2007,
+;;   2008, 2009  Free Software Foundation, Inc.
 
 ;; Author: Bill Perry <address@hidden>
 ;; Keywords: comm, data, processes
@@ -476,25 +476,27 @@
 
 (defun url-generate-unique-filename (&optional fmt)
   "Generate a unique filename in `url-temporary-directory'."
+  ;; This variable is obsolete, but so is this function.
+  (let ((tempdir (with-no-warnings url-temporary-directory)))
   (if (not fmt)
       (let ((base (format "url-tmp.%d" (user-real-uid)))
            (fname "")
            (x 0))
        (setq fname (format "%s%d" base x))
        (while (file-exists-p
-               (expand-file-name fname url-temporary-directory))
+                 (expand-file-name fname tempdir))
          (setq x (1+ x)
                fname (concat base (int-to-string x))))
-       (expand-file-name fname url-temporary-directory))
+         (expand-file-name fname tempdir))
     (let ((base (concat "url" (int-to-string (user-real-uid))))
          (fname "")
          (x 0))
       (setq fname (format fmt (concat base (int-to-string x))))
       (while (file-exists-p
-             (expand-file-name fname url-temporary-directory))
+               (expand-file-name fname tempdir))
        (setq x (1+ x)
              fname (format fmt (concat base (int-to-string x)))))
-      (expand-file-name fname url-temporary-directory))))
+       (expand-file-name fname tempdir)))))
 (make-obsolete 'url-generate-unique-filename 'make-temp-file "23.1")
 
 (defun url-extract-mime-headers ()