From d6c180c46bcd0e492695aefee576d51a7bdf32e6 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Fri, 24 Oct 2008 09:39:27 +0000 Subject: 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'. --- lisp/url/ChangeLog | 7 +++++-- lisp/url/url.el | 6 +----- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'lisp/url') 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 + + * url.el (url-configuration-directory): Use `locate-user-emacs-file'. + 2008-10-20 İsmail Dönmez (tiny change) * url-auth.el (url-basic-auth): Encode password string. @@ -769,8 +773,7 @@ 2005-06-14 Juanma Barranquero - * url-history.el (url-completion-function): Follow error - conventions. + * url-history.el (url-completion-function): Follow error conventions. 2005-06-13 Stefan Monnier 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) -- cgit v1.2.3