* url-cookie.el (url-cookie-retrieve): Handle null localpart.

[gnu-emacs] / lisp / url / url.el

diff --git a/lisp/url/url.el b/lisp/url/url.el
index ac7e47d9cc0590240ecf5147bfc344d43db13978..8cdbfc1fcebdb6a8626b932739e09ae88ff46aa3 100644 (file)
--- a/lisp/url/url.el
+++ b/lisp/url/url.el
@@ -1,7 +1,7 @@
 ;;; url.el --- Uniform Resource Locator retrieval tool
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004,
-;;   2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 
 ;; Author: Bill Perry <wmperry@gnu.org>
 ;; Keywords: comm, data, processes, hypermedia
@@ -45,12 +45,8 @@
 (require 'url-util)
 
 
-;; FIXME convert-standard-filename?
 (defcustom url-configuration-directory
-  (if (and (file-directory-p user-emacs-directory)
-           (not (file-directory-p "~/.url")))
-      (expand-file-name "url" user-emacs-directory)
-    "~/.url")
+  (locate-user-emacs-file "url/" ".url/")
   "Directory used by the URL package for cookies, history, etc."
   :type 'directory
   :group 'url)