From 442d607ec069c8fd433a21b63f4ac0544bad07ee Mon Sep 17 00:00:00 2001
From: Henrik Lissner <git@henrik.io>
Date: Mon, 4 Jul 2022 02:34:51 +0200
Subject: [PATCH] fix: remove outdated uses of user-emacs-directory

Doom changes user-emacs-directory (see 46844b5 for explanation), so
doom-emacs-dir should be used to refer to your $EMACSDIR instead.

Fix: #6530
Ref: 46844b55de0e
---
 core/autoload/debug.el                    | 2 +-
 core/cli/doctor.el                        | 4 ++--
 core/core-modules.el                      | 2 +-
 modules/config/default/autoload/search.el | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/autoload/debug.el b/core/autoload/debug.el
index 1d6a6ebd5..0b205b47b 100644
--- a/core/autoload/debug.el
+++ b/core/autoload/debug.el
@@ -258,7 +258,7 @@ ready to be pasted in a bug report on github."
                             'envvar-file)
                         (if (featurep 'exec-path-from-shell)
                             'exec-path-from-shell)
-                        (if (file-symlink-p user-emacs-directory)
+                        (if (file-symlink-p doom-emacs-dir)
                             'symlinked-emacsdir)
                         (if (file-symlink-p doom-private-dir)
                             'symlinked-doomdir)
diff --git a/core/cli/doctor.el b/core/cli/doctor.el
index 9ffac3010..327716c46 100644
--- a/core/cli/doctor.el
+++ b/core/cli/doctor.el
@@ -125,7 +125,7 @@ in."
          (dir (if (file-directory-p xdg-dir)
                   xdg-dir
                 doom-dir)))
-    (when (file-equal-p dir user-emacs-directory)
+    (when (file-equal-p dir doom-emacs-dir)
       (print! (error "Doom was cloned to %S, not ~/.emacs.d or ~/.config/emacs"
                      (path dir)))
       (explain! "Doom's source and your private Doom config have to live in separate directories. "
@@ -140,7 +140,7 @@ in."
       (explain! "The second directory will be ignored, as it has lower precedence.")))
 
   (print! (start "Checking for stale elc files..."))
-  (elc-check-dir user-emacs-directory)
+  (elc-check-dir doom-emacs-dir)
 
   (print! (start "Checking for problematic git global settings..."))
   (if (executable-find "git")
diff --git a/core/core-modules.el b/core/core-modules.el
index 47b2ccadb..6ac0b3ae5 100644
--- a/core/core-modules.el
+++ b/core/core-modules.el
@@ -377,7 +377,7 @@ This value is cached. If REFRESH-P, then don't use the cached value."
            (or (and (stringp arg)
                     (not (file-name-absolute-p arg))
                     (ignore-errors (dir!)))
-               user-emacs-directory)))
+               doom-emacs-dir)))
       (funcall fn label arg recursed)))
 
   ;; Adds two keywords to `use-package' to expand its lazy-loading capabilities:
diff --git a/modules/config/default/autoload/search.el b/modules/config/default/autoload/search.el
index 5da5a5d0d..2acea5d39 100644
--- a/modules/config/default/autoload/search.el
+++ b/modules/config/default/autoload/search.el
@@ -23,9 +23,9 @@ If prefix ARG is set, prompt for a directory to search from."
 
 ;;;###autoload
 (defun +default/search-emacsd ()
-  "Conduct a text search in files under `user-emacs-directory'."
+  "Conduct a text search in files under `doom-emacs-dir'."
   (interactive)
-  (let ((default-directory user-emacs-directory))
+  (let ((default-directory doom-emacs-dir))
     (call-interactively
      (cond ((featurep! :completion ivy)     #'+ivy/project-search-from-cwd)
            ((featurep! :completion helm)    #'+helm/project-search-from-cwd)