forked from vlaci/nix-doom-emacs
-
Notifications
You must be signed in to change notification settings - Fork 43
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
2ee0920
commit 4386c5c
Showing
3 changed files
with
56 additions
and
33 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
diff --git a/lisp/doom.el b/lisp/doom.el | ||
index ce585080f..350741b79 100644 | ||
--- a/lisp/doom.el | ||
+++ b/lisp/doom.el | ||
@@ -220,12 +220,7 @@ These files should not be shared across systems. By default, it is used by | ||
|
||
(define-obsolete-variable-alias 'doom-etc-dir 'doom-data-dir "3.0.0") | ||
(defvar doom-data-dir | ||
- (if doom-profile | ||
- (if IS-WINDOWS | ||
- (expand-file-name "doomemacs/data/" (getenv-internal "APPDATA")) | ||
- (expand-file-name "doom/" (or (getenv-internal "XDG_DATA_HOME") "~/.local/share"))) | ||
- ;; DEPRECATED: .local will be removed entirely in 3.0 | ||
- (file-name-concat doom-local-dir "etc/")) | ||
+ (expand-file-name "doom/" (or (getenv-internal "XDG_DATA_HOME") "~/.local/share")) | ||
"Where Doom stores its global data files. | ||
|
||
Data files contain shared and long-lived data that Doom, Emacs, and their | ||
@@ -239,12 +234,7 @@ generated files for profiles, profiles themselves, autoloads/loaddefs, etc. | ||
For profile-local data files, use `doom-profile-data-dir' instead.") | ||
|
||
(defvar doom-cache-dir | ||
- (if doom-profile | ||
- (if IS-WINDOWS | ||
- (expand-file-name "doomemacs/cache/" (getenv-internal "APPDATA")) | ||
- (expand-file-name "doom/" (or (getenv-internal "XDG_CACHE_HOME") "~/.cache"))) | ||
- ;; DEPRECATED: .local will be removed entirely in 3.0 | ||
- (file-name-concat doom-local-dir "cache/")) | ||
+ (expand-file-name "doom/" (or (getenv-internal "XDG_CACHE_HOME") "~/.cache")) | ||
"Where Doom stores its global cache files. | ||
|
||
Cache files represent non-essential data that shouldn't be problematic when | ||
@@ -258,12 +248,7 @@ session files, ELPA archives, authinfo files, org-persist, etc. | ||
For profile-local cache files, use `doom-profile-cache-dir' instead.") | ||
|
||
(defvar doom-state-dir | ||
- (if doom-profile | ||
- (if IS-WINDOWS | ||
- (expand-file-name "doomemacs/state/" (getenv-internal "APPDATA")) | ||
- (expand-file-name "doom/" (or (getenv-internal "XDG_STATE_HOME") "~/.local/state"))) | ||
- ;; DEPRECATED: .local will be removed entirely in 3.0 | ||
- (file-name-concat doom-local-dir "state/")) | ||
+ (expand-file-name "doom/" (or (getenv-internal "XDG_STATE_HOME") "~/.local/state")) | ||
"Where Doom stores its global state files. | ||
|
||
State files contain non-essential, unportable, but persistent data which, if | ||
@@ -291,7 +276,7 @@ For profile-local state files, use `doom-profile-state-dir' instead.") | ||
"For profile-local state files under `doom-state-dir'.") | ||
|
||
(defconst doom-profile-dir | ||
- (file-name-concat doom-profile-data-dir "@" (cdr doom-profile)) | ||
+ (file-name-concat doom-local-dir "etc" "@" (cdr doom-profile)) | ||
"Where generated files for the active profile are kept.") | ||
|
||
;; DEPRECATED: Will be moved to cli/env |
This file was deleted.
Oops, something went wrong.