nit: move obsolete aliases

To group together everything I plan to delete in v3.
This commit is contained in:
Henrik Lissner
2024-11-15 04:05:11 -05:00
parent 2373511daf
commit caab7f9263

View File

@ -175,7 +175,10 @@
(make-obsolete-variable 'EMACS28+ "Use (>= emacs-major-version 28) instead" "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") (make-obsolete-variable 'EMACS29+ "Use (>= emacs-major-version 29) instead" "3.0.0")
(make-obsolete-variable 'MODULES "Use (featurep 'dynamic-modules) instead" "3.0.0") (make-obsolete-variable 'MODULES "Use (featurep 'dynamic-modules) instead" "3.0.0")
(make-obsolete-variable 'NATIVECOMP "Use (featurep 'native-compile) instead" "3.0.0")) (make-obsolete-variable 'NATIVECOMP "Use (featurep 'native-compile) instead" "3.0.0")
(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"))
;; HACK: Silence obnoxious obsoletion warnings about (if|when)-let in >=31. ;; HACK: Silence obnoxious obsoletion warnings about (if|when)-let in >=31.
;; These warnings are unhelpful to end-users, and so, so many packages use ;; These warnings are unhelpful to end-users, and so, so many packages use
@ -240,7 +243,6 @@
(defvar doom-modules-dir (expand-file-name "modules/" doom-emacs-dir) (defvar doom-modules-dir (expand-file-name "modules/" doom-emacs-dir)
"The root directory for Doom's modules. Must end with a slash.") "The root directory for Doom's modules. Must end with a slash.")
(define-obsolete-variable-alias 'doom-private-dir 'doom-user-dir "3.0.0")
(defvar doom-user-dir (defvar doom-user-dir
(expand-file-name (expand-file-name
(if-let (doomdir (getenv-internal "DOOMDIR")) (if-let (doomdir (getenv-internal "DOOMDIR"))
@ -289,7 +291,6 @@ 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 These files should not be shared across systems. By default, it is used by
`doom-data-dir' and `doom-cache-dir'. Must end with a slash.") `doom-data-dir' and `doom-cache-dir'. Must end with a slash.")
(define-obsolete-variable-alias 'doom-etc-dir 'doom-data-dir "3.0.0")
(defvar doom-data-dir (defvar doom-data-dir
(if doom-profile (if doom-profile
(if doom--system-windows-p (if doom--system-windows-p