# HG changeset patch # User Glenn Morris # Date 1197352105 0 # Node ID 54b328f5434f5b01215e9443202572ebf44c8ae4 # Parent 1d21f80a768fd7fe130fcf14ea322eadf50e4f29 (url-configuration-directory): Make it a defcustom. diff -r 1d21f80a768f -r 54b328f5434f lisp/url/url.el --- 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.