[elpa] externals/org f99a8ea434 04/50: Backport commit 104e90d93 from Emacs

[ELPA Syncer]

branch: externals/org
commit f99a8ea434c2c565337ee7a0075cd1e273fa6e75
Author: Stefan Kangas <stefan@marxist.se>
Commit: Kyle Meyer <kyle@kyleam.com>

    Backport commit 104e90d93 from Emacs
    
    * lisp/org-clock.el (org-clock-persist-file):
    * lisp/org-id.el (org-id-locations-file): Prefer
    'locate-user-emacs-file' to fiddling with 'user-emacs-directory'
    directly.
    
    Prefer locate-user-emacs-file
    104e90d93664892ed1a7a1631c5b0141d0552a60
    Stefan Kangas
    Tue Nov 9 07:51:27 2021 +0100
---
 lisp/org-clock.el | 3 +--
 lisp/org-id.el    | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 081a617834..bce801a78c 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -219,8 +219,7 @@ Emacs initialization file."
          (const :tag "Clock and history" t)
          (const :tag "No persistence" nil)))
 
-(defcustom org-clock-persist-file (convert-standard-filename
-                                  (concat user-emacs-directory 
"org-clock-save.el"))
+(defcustom org-clock-persist-file (locate-user-emacs-file "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 b4acec7bdd..7334050b8b 100644
--- a/lisp/org-id.el
+++ b/lisp/org-id.el
@@ -196,8 +196,7 @@ the link."
   :group 'org-id
   :type 'boolean)
 
-(defcustom org-id-locations-file (convert-standard-filename
-                                 (concat user-emacs-directory 
".org-id-locations"))
+(defcustom org-id-locations-file (locate-user-emacs-file ".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