features/user-directory 5c14f2e: Defer to startup.el for finding the config user-directory

[Stefan Kangas]

branch: features/user-directory
commit 5c14f2efa3797279413d5d523e4be8c8ca2d49e5
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Defer to startup.el for finding the config user-directory
    
    * lisp/user-directory.el (user-directory) [config]: Defer to
    startup.el.
---
 lisp/user-directory.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lisp/user-directory.el b/lisp/user-directory.el
index 72876bd..c5d9b82 100644
--- a/lisp/user-directory.el
+++ b/lisp/user-directory.el
@@ -141,7 +141,7 @@ customize the variable `user-directory-warning'."
 (cl-defmethod user-directory ((_type (eql 'cache)))
   "Return the user cache directory.
 The cache directory contains non-essential user data that is not
-necessarily important to save.  "
+necessarily important to save."
   (cons (expand-file-name "emacs" (xdg-cache-home))
         '("~/.cache/emacs")))
 
@@ -149,8 +149,8 @@ necessarily important to save.  "
   "Return the user configuration file directory.
 The configuration file directory contains any user-specific
 configuration."
-  (cons (expand-file-name "emacs" (xdg-config-home))
-        '("~/.config/emacs")))
+  ;; We rely startup.el to find and set this.
+  (list user-emacs-directory))
 
 (cl-defmethod user-directory ((_type (eql 'data)))
   "Return the user data directory.