emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor: deprecate doom-etc-dir for doom-data-dir

Browse source 
doom-etc-dir will be renamed to doom-data-dir, to better reflect its
purpose, and align it with XDG_DATA_HOME (where it will be moved to in
v3, where Doom will begin to obey XDG directory conventions more
closely).
This commit is contained in:
Henrik Lissner 2022-08-14 18:10:01 +02:00
parent a5c80fcb4b
commit aa54383b5d
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
28 changed files with 42 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/doom.el
View file

@ -230,9 +230,9 @@ downloaded/installed by packages. Must end in a slash.")
Use this as a storage location for this system's installation of Doom Emacs.
These files should not be shared across systems. By default, it is used by
`doom-etc-dir' and `doom-cache-dir'. Must end with a slash.")
`doom-data-dir' and `doom-cache-dir'. Must end with a slash.")
(defconst doom-etc-dir
(defconst doom-data-dir
(if doom-profile
doom-profile-data-dir
(concat doom-local-dir "etc/"))
@ -274,6 +274,7 @@ users).")
;;; Legacy support
(define-obsolete-variable-alias 'doom-private-dir 'doom-user-dir "3.0.0")
(define-obsolete-variable-alias 'doom-etc-dir 'doom-data-dir "3.0.0")
(make-obsolete-variable 'EMACS28+ "Use (>= emacs-major-version 28) instead" "3.0.0")
(make-obsolete-variable 'EMACS29+ "Use (>= emacs-major-version 29) instead" "3.0.0")
@ -351,7 +352,7 @@ users).")
;; By default, Emacs stores `authinfo' in $HOME and in plain-text. Let's not do
;; that, mkay? This file stores usernames, passwords, and other treasures for
;; the aspiring malicious third party. You'll need a GPG setup though.
(setq auth-sources (list (concat doom-etc-dir "authinfo.gpg")
(setq auth-sources (list (concat doom-data-dir "authinfo.gpg")
"~/.authinfo.gpg"))
(define-advice en/disable-command (:around (fn &rest args) write-to-data-dir)