aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2007-12-11 05:48:25 +0000
committerGlenn Morris2007-12-11 05:48:25 +0000
commit4577244fc903ff0344abd1f9cf3d75e50b4fa953 (patch)
tree5e88d4c6fe4bddfc878e01797e5f32ce7e0bf724
parentcef98b1310b1feb4201618067d7fcae4bc04923f (diff)
downloademacs-4577244fc903ff0344abd1f9cf3d75e50b4fa953.tar.gz
emacs-4577244fc903ff0344abd1f9cf3d75e50b4fa953.zip
(url-configuration-directory): Make it a defcustom.
-rw-r--r--lisp/url/url.el17
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 @@
46(require 'url-parse) 46(require 'url-parse)
47(require 'url-util) 47(require 'url-util)
48 48
49;; Fixme: customize? convert-standard-filename? 49
50(defvar url-configuration-directory 50;; FIXME convert-standard-filename?
51 (cond 51(defcustom url-configuration-directory
52 ((file-directory-p "~/.url") "~/.url") 52 (if (and (file-directory-p user-emacs-directory)
53 ((file-directory-p user-emacs-directory) 53 (not (file-directory-p "~/.url")))
54 (concat user-emacs-directory "url")) 54 (expand-file-name "url" user-emacs-directory)
55 (t "~/.url"))) 55 "~/.url")
56 "Directory used by the URL package for cookies, history, etc."
57 :type 'directory
58 :group 'url)
56 59
57(defun url-do-setup () 60(defun url-do-setup ()
58 "Setup the url package. 61 "Setup the url package.