aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/url
diff options
context:
space:
mode:
authorJuanma Barranquero <[email protected]>2008-10-24 09:39:27 +0000
committerJuanma Barranquero <[email protected]>2008-10-24 09:39:27 +0000
commitd6c180c46bcd0e492695aefee576d51a7bdf32e6 (patch)
tree5c234b6bd9501b91148dc39777f612b9fc1cadd8 /lisp/url
parentecd43cb971723a8573afaa4ba6c8d50de7aa6db5 (diff)
New function `locate-user-emacs-file'.
* subr.el (locate-user-emacs-file): New function. (user-emacs-directory): Mention it in docstring. * completion.el (save-completions-file-name): * filesets.el (filesets-menu-cache-file): * image-dired.el (image-dired-dir, image-dired-db-file) (image-dired-temp-image-file, image-dired-gallery-dir) (image-dired-temp-rotate-image-file): * savehist.el (savehist-file): * server.el (server-auth-dir): * startup.el (auto-save-list-file-prefix): * thumbs.el (thumbs-thumbsdir): * tutorial.el (tutorial--saved-dir): * play/gamegrid.el (gamegrid-user-score-file-directory): Use it. * url.el (url-configuration-directory): Use `locate-user-emacs-file'. * NEWS: New function `locate-user-emacs-file'.
Diffstat (limited to 'lisp/url')
-rw-r--r--lisp/url/ChangeLog7
-rw-r--r--lisp/url/url.el6
2 files changed, 6 insertions, 7 deletions
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 7e7ead4dfd..b27b7255e4 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-24 Juanma Barranquero <[email protected]>
+
+ * url.el (url-configuration-directory): Use `locate-user-emacs-file'.
+
2008-10-20 İsmail Dönmez <[email protected]> (tiny change)
* url-auth.el (url-basic-auth): Encode password string.
@@ -769,8 +773,7 @@
2005-06-14 Juanma Barranquero <[email protected]>
- * url-history.el (url-completion-function): Follow error
- conventions.
+ * url-history.el (url-completion-function): Follow error conventions.
2005-06-13 Stefan Monnier <[email protected]>
diff --git a/lisp/url/url.el b/lisp/url/url.el
index ac7e47d9cc..c066e39c00 100644
--- a/lisp/url/url.el
+++ b/lisp/url/url.el
@@ -45,12 +45,8 @@
(require 'url-util)
-;; 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")
+ (locate-user-emacs-file ".url/" "url/")
"Directory used by the URL package for cookies, history, etc."
:type 'directory
:group 'url)