diff options
author | Glenn Morris <rgm@gnu.org> | 2007-12-11 05:48:25 +0000 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2007-12-11 05:48:25 +0000 |
commit | 4577244fc903ff0344abd1f9cf3d75e50b4fa953 (patch) | |
tree | 5e88d4c6fe4bddfc878e01797e5f32ce7e0bf724 /lisp/url | |
parent | cef98b1310b1feb4201618067d7fcae4bc04923f (diff) | |
download | emacs-4577244fc903ff0344abd1f9cf3d75e50b4fa953.tar.gz |
(url-configuration-directory): Make it a defcustom.
Diffstat (limited to 'lisp/url')
-rw-r--r-- | lisp/url/url.el | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/lisp/url/url.el b/lisp/url/url.el index c375a75e06f..448b31f4b68 100644 --- a/lisp/url/url.el +++ b/lisp/url/url.el @@ -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. |