comparison lisp/url/url.el @ 87255:54b328f5434f

(url-configuration-directory): Make it a defcustom.
author Glenn Morris <rgm@gnu.org>
date Tue, 11 Dec 2007 05:48:25 +0000
parents 2cce56fd7361
children 107ccd98fa12
comparison
equal deleted inserted replaced
87254:1d21f80a768f 87255:54b328f5434f
44 (require 'url-methods) 44 (require 'url-methods)
45 (require 'url-proxy) 45 (require 'url-proxy)
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.
59 This is to avoid conflict with user settings if URL is dumped with 62 This is to avoid conflict with user settings if URL is dumped with
60 Emacs." 63 Emacs."