* org-id.el (org-id-locations-file):

* org-clock.el (org-clock-persist-file): Fix hardcoded
reference to "~/.emacs.d".

* contrib/lisp/org-track.el (org-track-directory): Fix hardcoded
reference to "~/.emacs.d".

diff --git a/contrib/lisp/org-track.el b/contrib/lisp/org-track.el
index d058135..a44472e 100644 (file)
--- a/contrib/lisp/org-track.el
+++ b/contrib/lisp/org-track.el
@@ -72,7 +72,7 @@ time to time."
   :version "22.1"
   :group 'org)
 
-(defcustom org-track-directory "~/.emacs.d/org/lisp"
+(defcustom org-track-directory (concat user-emacs-directory "org/lisp")
   "Directory where your org-mode/ directory lives.
 If that directory does not exist, it will be created."
   :type 'directory)

diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 823eac8..92168bc 100644 (file)
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -194,7 +194,7 @@ Emacs initialization file."
          (const :tag "No persistence" nil)))
 
 (defcustom org-clock-persist-file (convert-standard-filename
-                                  "~/.emacs.d/org-clock-save.el")
+                                  (concat user-emacs-directory "org-clock-save.el"))
   "File to save clock data to."
   :group 'org-clock
   :type 'string)

diff --git a/lisp/org-id.el b/lisp/org-id.el
index 5d8e5b0..b35ea5e 100644 (file)
--- a/lisp/org-id.el
+++ b/lisp/org-id.el
@@ -186,7 +186,7 @@ the link."
   :type 'boolean)
 
 (defcustom org-id-locations-file (convert-standard-filename
-                                 "~/.emacs.d/.org-id-locations")
+                                 (concat user-emacs-directory ".org-id-locations"))
   "The file for remembering in which file an ID was defined.
 This variable is only relevant when `org-id-track-globally' is set."
   :group 'org-id