Mercurial > emacs

changeset 87255:54b328f5434f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(url-configuration-directory): Make it a defcustom.
author Glenn Morris <rgm@gnu.org>
date Tue, 11 Dec 2007 05:48:25 +0000
parents 1d21f80a768f
children c83eca3fbd1a
files lisp/url/url.el
diffstat 1 files changed, 10 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/url/url.el	Tue Dec 11 05:48:08 2007 +0000
+++ b/lisp/url/url.el	Tue Dec 11 05:48:25 2007 +0000
@@ -46,13 +46,16 @@
 (require 'url-parse)
 (require 'url-util)
 
-;; Fixme: customize? convert-standard-filename?
-(defvar url-configuration-directory
-  (cond
-   ((file-directory-p "~/.url") "~/.url")
-   ((file-directory-p user-emacs-directory)
-    (concat user-emacs-directory "url"))
-   (t "~/.url")))
+
+;; 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")
+  "Directory used by the URL package for cookies, history, etc."
+  :type 'directory
+  :group 'url)
 
 (defun url-do-setup ()
   "Setup the url package.