From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 21 Dec 2005 20:04:41 +0000 (+0000)
Subject: (url-configuration-directory): Use ~/.emacs.d if possible.
X-Git-Tag: emacs-pretest-22.0.90~5145
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=208d45772d458f8ab025663040cbd5f34f4ff54d;p=emacs.git

(url-configuration-directory): Use ~/.emacs.d if possible.
---

diff --git a/lisp/url/url.el b/lisp/url/url.el
index 81d2d39c281..296b2b9f868 100644
--- a/lisp/url/url.el
+++ b/lisp/url/url.el
@@ -48,7 +48,11 @@
 
 ;; Fixme: customize? convert-standard-filename?
 ;;;###autoload
-(defvar url-configuration-directory "~/.url")
+(defvar url-configuration-directory
+  (cond
+   ((file-directory-p "~/.url") "~/.url")
+   ((file-directory-p "~/.emacs.d") "~/.emacs.d/url")
+   (t "~/.url")))
 
 (defun url-do-setup ()
   "Setup the url package.