fix: s/3.0.0-pre/2.1.0/ in deprecation warnings

Amend: 4f4911fed9
This commit is contained in:
Henrik Lissner 2026-04-01 23:52:01 -04:00
parent 4f4911fed9
commit 548d164e1b
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
14 changed files with 63 additions and 131 deletions

4
.doom
View file

@ -1,6 +1,6 @@
"3.0.0-pre"
"2.1.0"
((name . doom)
(version . "3.0.0-pre")
(version . "2.1.0")
(homepage . "https://doomemacs.org")
(commit

View file

@ -273,9 +273,9 @@ SEE ALSO:
(defcli-autoload! (gc))
(defcli-autoload! (install))
(defcli-obsolete! (profiles sync) (profile sync "--all") "3.0.0")
(defcli-obsolete! ((build b)) (sync "--rebuild") "3.0.0")
(defcli-obsolete! ((purge p)) (gc) "3.0.0")
(defcli-obsolete! (profiles sync) (profile sync "--all") "2.1.0")
(defcli-obsolete! ((build b)) (sync "--rebuild") "2.1.0")
(defcli-obsolete! ((purge p)) (gc) "2.1.0")
;; TODO Post-3.0 commands
(defcli-stub! module)
@ -288,7 +288,7 @@ SEE ALSO:
(defcli-autoload! (ci))
(defcli-autoload! (make))
(defcli-autoload! (emacs))
(defcli-obsolete! (run) (emacs) "3.0.0")
(defcli-obsolete! (run) (emacs) "2.1.0")
;; TODO Post-3.0 commands
(defcli-stub! test))

View file

@ -20,7 +20,7 @@ are great, but this file exists to add demos for Doom's API and beyond.
* add-hook!
:PROPERTIES:
:added: 3.0.0-pre
:added: 2.1.0
:END:
#+begin_src emacs-lisp
;; With only one hook and one function, this is identical to `add-hook'. In that
@ -51,11 +51,11 @@ are great, but this file exists to add demos for Doom's API and beyond.
* TODO add-transient-hook!
:PROPERTIES:
:added: 3.0.0-pre
:added: 2.1.0
:END:
* after!
:PROPERTIES:
:added: 3.0.0-pre
:added: 2.1.0
:END:
#+begin_src emacs-lisp :eval no
;;; `after!' will take:
@ -84,7 +84,7 @@ are great, but this file exists to add demos for Doom's API and beyond.
#+end_src
* cmd!
:PROPERTIES:
:added: 3.0.0-pre
:added: 2.1.0
:END:
#+begin_src emacs-lisp :eval no
(map! "C-j" (cmd! (newline) (indent-according-to-mode)))
@ -92,7 +92,7 @@ are great, but this file exists to add demos for Doom's API and beyond.
* cmd!!
:PROPERTIES:
:added: 3.0.0-pre
:added: 2.1.0
:END:
When ~newline~ is passed a numerical prefix argument (=C-u 5 M-x newline=), it
inserts N newlines. We can use ~cmd!!~ to easily create a keybinds that bakes in
@ -114,7 +114,7 @@ Or to create aliases for functions that behave differently:
* cmds!
:PROPERTIES:
:added: 3.0.0-pre
:added: 2.1.0
:END:
#+begin_src emacs-lisp :eval no
(map! :i [tab] (cmds! (and (modulep! :editor snippets)
@ -137,7 +137,7 @@ Or to create aliases for functions that behave differently:
* custom-set-faces!
:PROPERTIES:
:added: 3.0.0-pre
:added: 2.1.0
:END:
#+begin_src emacs-lisp :eval no
(custom-set-faces!
@ -172,7 +172,7 @@ Or to create aliases for functions that behave differently:
* custom-theme-set-faces!
:PROPERTIES:
:added: 3.0.0-pre
:added: 2.1.0
:END:
#+begin_src emacs-lisp :eval no
(custom-theme-set-faces! 'doom-one
@ -207,15 +207,15 @@ Or to create aliases for functions that behave differently:
* TODO defer-feature!
:PROPERTIES:
:added: 3.0.0-pre
:added: 2.1.0
:END:
* TODO defer-until!
:PROPERTIES:
:added: 3.0.0-pre
:added: 2.1.0
:END:
* disable-packages!
:PROPERTIES:
:added: 3.0.0-pre
:added: 2.1.0
:END:
#+begin_src emacs-lisp :eval no
;; Disable packages enabled by DOOM
@ -224,7 +224,7 @@ Or to create aliases for functions that behave differently:
* doom!
:PROPERTIES:
:added: 3.0.0-pre
:added: 2.1.0
:END:
#+begin_src emacs-lisp :eval no
(doom! :completion
@ -257,7 +257,7 @@ Or to create aliases for functions that behave differently:
* file-exists-p!
:PROPERTIES:
:added: 3.0.0-pre
:added: 2.1.0
:END:
#+begin_src emacs-lisp
(file-exists-p! "init.el" doom-emacs-dir)
@ -287,7 +287,7 @@ Or to create aliases for functions that behave differently:
* kbd!
:PROPERTIES:
:added: 3.0.0-pre
:added: 2.1.0
:END:
#+begin_src emacs-lisp :eval no
(map! "," (kbd! "SPC")
@ -304,7 +304,7 @@ Or to create aliases for functions that behave differently:
#+end_src
* letf!
:PROPERTIES:
:added: 3.0.0-pre
:added: 2.1.0
:END:
#+begin_src emacs-lisp :eval yes
(letf! (defun greet (name)
@ -370,7 +370,7 @@ Calling "lexical" functions recursively:
* load!
:PROPERTIES:
:added: 3.0.0-pre
:added: 2.1.0
:END:
#+begin_src emacs-lisp :eval no
;;; Lets say we're in ~/.doom.d/config.el
@ -384,7 +384,7 @@ Calling "lexical" functions recursively:
* map!
:PROPERTIES:
:added: 3.0.0-pre
:added: 2.1.0
:END:
#+begin_src emacs-lisp :eval no
(map! :map magit-mode-map
@ -482,7 +482,7 @@ These are side-by-side comparisons, showing how to bind keys with and without
* package!
:PROPERTIES:
:added: 3.0.0-pre
:added: 2.1.0
:END:
#+begin_src emacs-lisp :eval no
;; To install a package that can be found on ELPA or any of the sources
@ -516,7 +516,7 @@ These are side-by-side comparisons, showing how to bind keys with and without
#+end_src
* pushnew!
:PROPERTIES:
:added: 3.0.0-pre
:added: 2.1.0
:END:
#+begin_src emacs-lisp
(let ((list '(a b c)))
@ -529,7 +529,7 @@ These are side-by-side comparisons, showing how to bind keys with and without
* quiet!
:PROPERTIES:
:added: 3.0.0-pre
:added: 2.1.0
:END:
#+begin_src emacs-lisp :eval no
;; Enters recentf-mode without extra output
@ -537,7 +537,7 @@ These are side-by-side comparisons, showing how to bind keys with and without
#+end_src
* remove-hook!
:PROPERTIES:
:added: 3.0.0-pre
:added: 2.1.0
:END:
#+begin_src emacs-lisp :eval no
;; With only one hook and one function, this is identical to `remove-hook'. In
@ -558,7 +558,7 @@ These are side-by-side comparisons, showing how to bind keys with and without
#+end_src
* setq-hook!
:PROPERTIES:
:added: 3.0.0-pre
:added: 2.1.0
:END:
#+begin_src emacs-lisp :eval no
;; Set multiple variables after a hook
@ -573,7 +573,7 @@ These are side-by-side comparisons, showing how to bind keys with and without
* unsetq-hook!
:PROPERTIES:
:added: 3.0.0-pre
:added: 2.1.0
:END:
#+begin_src emacs-lisp :eval no
(unsetq-hook! 'markdown-mode-hook line-spacing)
@ -589,7 +589,7 @@ These are side-by-side comparisons, showing how to bind keys with and without
#+end_src
* use-package!
:PROPERTIES:
:added: 3.0.0-pre
:added: 2.1.0
:END:
#+begin_src emacs-lisp :eval no
;; Use after-call to load package before hook
@ -608,7 +608,7 @@ These are side-by-side comparisons, showing how to bind keys with and without
* versionp!
:PROPERTIES:
:added: 3.0.0-pre
:added: 2.1.0
:END:
#+begin_src emacs-lisp
(versionp! "25.3" > "27.1")

View file

@ -1356,74 +1356,6 @@ ARGS are options passed to less. If DOOMPAGER is set, ARGS are ignored."
;; (defun doom-cli--exit-emacs (args context)) ; TODO: Launch Emacs subsession
;;
;;; Migration paths
;; (defvar doom-cli-context-restore-functions
;; '(doom-cli-context--restore-legacy-fn)
;; "A list of functions intended to unserialize `doom-cli-context'.
;; They all take one argument, the raw data saved to $__DOOMCONTEXT. Each function
;; must return the version string corresponding to the version of Doom they have
;; transformed it for.")
;; (defun doom-cli-context-restore (file context)
;; "Restore the last restarted context from FILE into CONTEXT."
;; (when (and (stringp file)
;; (file-exists-p file))
;; (when-let* ((data (with-temp-buffer
;; (insert-file-contents file)
;; (read (current-buffer))))
;; (version (if (stringp (car data)) (car data) "0"))
;; (old-context (if (string (car data)) (cdr data) data))
;; (new-context (make-doom-cli-context))
;; (struct-info (cl-loop for (slot _initval . plist) in (cdr (cl-struct-slot-info 'doom-cli-context))
;; collect (cons (cl-struct-slot-offset 'doom-cli-context slot)
;; (cons slot plist)))))
;; ;; (let ((version (if (stringp (car data)) (car data) "0"))
;; ;; (data (if (string (car data)) (cdr data) data))
;; ;; (newcontext (make-doom-cli-context)))
;; ;; (dolist (fn doom-cli-context-restore-functions)
;; ;; (setq newcontext (funcall fn newcontext data version))))
;; (unless (doom-cli-context-p old-context)
;; (error "An invalid context was restored from file: %s" file))
;; (unless (equal (doom-cli-context-prefix context)
;; (doom-cli-context-prefix old-context))
;; (error "Restored context belongs to another script: %s"
;; (doom-cli-context-prefix old-context)))
;; (pcase-dolist (`(,slot ,_ . ,plist)
;; (cdr (cl-struct-slot-info 'doom-cli-context)))
;; (unless (plist-get plist :skip)
;; (let* ((idx (cl-struct-slot-offset 'doom-cli-context slot))
;; (old-value (aref old-context idx)))
;; (aset context idx
;; (pcase (plist-get plist :type)
;; (`alist
;; (dolist (entry old-value (aref context idx))
;; (setf (alist-get (car entry) (aref context idx)) (cdr entry))))
;; (`buffer
;; (with-current-buffer (aref context idx)
;; (insert old-value)
;; (current-buffer)))
;; (_ old-value))))))
;; (run-hook-with-args 'doom-cli-create-context-functions context)
;; (delete-file file)
;; (doom-log "Restored context: %s" (doom-cli-context-pid context))
;; context)))
;; (defun doom-cli-context--restore-legacy-fn (data old-version)
;; "Update `doom-cli-context' from <3.0.0 to 3.0.0."
;; (when (or (equal old-version "3.0.0-dev")
;; (string-match-p "^2\\.0\\." old-version))
;; "3.0.0"))
;; (defun doom-cli-context--restore-3.1.0-fn (data old-version))
;;
;;; Misc

View file

@ -128,7 +128,7 @@ list is returned as-is."
;;
;;; Public library
(define-obsolete-function-alias 'doom-enlist 'ensure-list "3.0.0")
(define-obsolete-function-alias 'doom-enlist 'ensure-list "2.1.0")
(defun doom-unquote (exp)
"Return EXP unquoted."
@ -386,7 +386,7 @@ TRIGGER-HOOK is a list of quoted hooks and/or sharp-quoted functions."
(let (file-name-handler-alist)
(file-name-directory (macroexpand '(file!)))))
(define-obsolete-function-alias 'letenv! 'with-environment-variables "3.0.0")
(define-obsolete-function-alias 'letenv! 'with-environment-variables "2.1.0")
(put 'defun* 'lisp-indent-function 'defun)
(defmacro letf! (bindings &rest body)
@ -488,8 +488,8 @@ echo-area, but not to *Messages*."
(save-silently t))
(prog1 ,@forms (message ""))))))
(define-obsolete-function-alias 'eval-if! 'static-if "3.0.0")
(define-obsolete-function-alias 'eval-when! 'static-when "3.0.0")
(define-obsolete-function-alias 'eval-if! 'static-if "2.1.0")
(define-obsolete-function-alias 'eval-when! 'static-when "2.1.0")
(defmacro versionp! (v1 comp v2 &rest comps)
"Perform compound version checks.
@ -835,18 +835,18 @@ issues"
;; DEPRECATED: Remove in v3.0
(defmacro appendq! (sym &rest lists)
"Append LISTS to SYM in place."
(declare (obsolete "Use `cl-callf2' instead" "3.0.0"))
(declare (obsolete "Use `cl-callf2' instead" "2.1.0"))
`(setq ,sym (append ,sym ,@lists)))
;; DEPRECATED: Remove in v3
(define-obsolete-function-alias 'setq! 'setopt "3.0.0")
(define-obsolete-function-alias 'setq! 'setopt "2.1.0")
;; DEPRECATED: Remove in v3.0
(defmacro delq! (elt list &optional fetcher)
"`delq' ELT from LIST in-place.
If FETCHER is a function, ELT is used as the key in LIST (an alist)."
(declare (obsolete "Use `cl-callf2' or `alist-get' instead" "3.0.0"))
(declare (obsolete "Use `cl-callf2' or `alist-get' instead" "2.1.0"))
`(setq ,list (delq ,(if fetcher
`(funcall ,fetcher ,elt ,list)
elt)
@ -856,7 +856,7 @@ If FETCHER is a function, ELT is used as the key in LIST (an alist)."
(defmacro pushnew! (place &rest values)
"Push VALUES sequentially into PLACE, if they aren't already present.
This is a variadic `cl-pushnew'."
(declare (obsolete "Use a loop with `add-to-list' or `cl-pushnew' instead" "3.0.0"))
(declare (obsolete "Use a loop with `add-to-list' or `cl-pushnew' instead" "2.1.0"))
(let ((var (make-symbol "result")))
`(dolist (,var (list ,@values) (with-no-warnings ,place))
(cl-pushnew ,var ,place :test #'equal))))
@ -864,7 +864,7 @@ This is a variadic `cl-pushnew'."
;; DEPRECATED: Remove in v3.0
(defmacro prependq! (sym &rest lists)
"Prepend LISTS to SYM in place."
(declare (obsolete "Use `cl-callf2' instead" "3.0.0"))
(declare (obsolete "Use `cl-callf2' instead" "2.1.0"))
`(setq ,sym (append ,@lists ,sym)))
@ -1547,7 +1547,7 @@ in these blocks dictates their load order (unless given an explicit :depth)."
t))
;; DEPRECATED: Remove in v3
(define-obsolete-function-alias 'featurep! 'modulep! "3.0.0")
(define-obsolete-function-alias 'featurep! 'modulep! "2.1.0")
(defmacro modulep! (group &optional module &rest flags)
"Return t if :GROUP MODULE (and +FLAGS) are enabled.

View file

@ -2,7 +2,7 @@
;;; Commentary:
;;; Code:
(define-obsolete-variable-alias 'doom-projectile-fd-binary 'doom-fd-executable "3.0.0")
(define-obsolete-variable-alias 'doom-projectile-fd-binary 'doom-fd-executable "2.1.0")
(defvar doom-fd-executable (cl-find-if #'executable-find (list "fdfind" "fd"))
"The filename of the fd executable.

View file

@ -47,7 +47,7 @@ An omitted font size means to inherit `doom-font''s size."
:type '(restricted-sexp :match-alternatives (fontp stringp 'nil))
:group 'doom)
(define-obsolete-variable-alias 'doom-unicode-font 'doom-symbol-font "3.0.0")
(define-obsolete-variable-alias 'doom-unicode-font 'doom-symbol-font "2.1.0")
(defcustom doom-symbol-font nil
"Fallback font for symbols.
Must be a `font-spec', a font object, an XFT font string, or an XLFD string. See

View file

@ -175,17 +175,17 @@
(defconst MODULES (featurep 'dynamic-modules))
(defconst NATIVECOMP (featurep 'native-compile))
(make-obsolete-variable 'IS-MAC "Use (featurep :system 'macos) instead" "3.0.0")
(make-obsolete-variable 'IS-LINUX "Use (featurep :system 'linux) instead" "3.0.0")
(make-obsolete-variable 'IS-WINDOWS "Use (featurep :system 'windows) instead" "3.0.0")
(make-obsolete-variable 'IS-BSD "Use (featurep :system 'bsd) 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 'MODULES "Use (featurep 'dynamic-modules) instead" "3.0.0")
(make-obsolete-variable 'NATIVECOMP "Use (featurep 'native-compile) instead" "3.0.0")
(make-obsolete-variable 'IS-MAC "Use (featurep :system 'macos) instead" "2.1.0")
(make-obsolete-variable 'IS-LINUX "Use (featurep :system 'linux) instead" "2.1.0")
(make-obsolete-variable 'IS-WINDOWS "Use (featurep :system 'windows) instead" "2.1.0")
(make-obsolete-variable 'IS-BSD "Use (featurep :system 'bsd) instead" "2.1.0")
(make-obsolete-variable 'EMACS28+ "Use (>= emacs-major-version 28) instead" "2.1.0")
(make-obsolete-variable 'EMACS29+ "Use (>= emacs-major-version 29) instead" "2.1.0")
(make-obsolete-variable 'MODULES "Use (featurep 'dynamic-modules) instead" "2.1.0")
(make-obsolete-variable 'NATIVECOMP "Use (featurep 'native-compile) instead" "2.1.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"))
(define-obsolete-variable-alias 'doom-private-dir 'doom-user-dir "2.1.0")
(define-obsolete-variable-alias 'doom-etc-dir 'doom-data-dir "2.1.0"))
;; HACK: Silence obnoxious obsoletion warnings about (if|when)-let in >=31.
;; These warnings are unhelpful to end-users, and many packages use these

View file

@ -76,7 +76,7 @@ If the glob ends in a slash, only returns matching directories."
(file-expand-wildcards path))))
;;;###autoload
(define-obsolete-function-alias 'doom-dir 'doom-path "3.0.0")
(define-obsolete-function-alias 'doom-dir 'doom-path "2.1.0")
;;;###autoload
(cl-defun doom-files-in

View file

@ -6,7 +6,7 @@
"A table of enabled modules and metadata. See `doom-modules-initialize'.")
;; DEPRECATED: Remove in v3, as it will be handled in the CLI
(make-obsolete-variable 'doom-obsolete-modules nil "3.0.0")
(make-obsolete-variable 'doom-obsolete-modules nil "2.1.0")
(defconst doom-obsolete-modules
'((:feature (version-control (:emacs vc) (:ui vc-gutter))
(spellcheck (:checkers spell))
@ -49,7 +49,7 @@ syntax-checker modules obsolete. e.g. If :feature version-control is found in
your `doom!' block, a warning is emitted before replacing it with :emacs vc and
:ui vc-gutter.")
(make-obsolete-variable 'doom-inhibit-module-warnings nil "3.0.0")
(make-obsolete-variable 'doom-inhibit-module-warnings nil "2.1.0")
(defvar doom-inhibit-module-warnings (not noninteractive)
"If non-nil, don't emit deprecated or missing module warnings at startup.")

View file

@ -20,7 +20,7 @@
;;; Library
;;;###autoload
(define-obsolete-function-alias 'doom-plist-get #'cl-getf "3.0.0")
(define-obsolete-function-alias 'doom-plist-get #'cl-getf "2.1.0")
;;;###autoload
(defun doom-plist-map (fn plist)

View file

@ -44,8 +44,8 @@ playback."
(format (format "%%%ds | %%s" +irc-left-padding)
(concat "*** " left) right))
(define-obsolete-variable-alias '+irc-notifications-watch-strings 'circe-notifications-watch-strings "3.0.0")
(define-obsolete-variable-alias '+irc-time-stamp-format 'lui-time-stamp-format "3.0.0")
(define-obsolete-variable-alias '+irc-notifications-watch-strings 'circe-notifications-watch-strings "2.1.0")
(define-obsolete-variable-alias '+irc-time-stamp-format 'lui-time-stamp-format "2.1.0")
;;

View file

@ -358,7 +358,7 @@ as `+emacs-lisp-non-package-mode' will enable it and disable the other checkers.
(define-minor-mode +emacs-lisp--flymake-non-package-mode
""
:since "3.0.0"
:since "2.1.0"
(if +emacs-lisp--flymake-non-package-mode
(progn
(remove-hook! 'flymake-diagnostic-functions :local #'elisp-flymake-checkdoc #'elisp-flymake-byte-compile)
@ -368,7 +368,7 @@ as `+emacs-lisp-non-package-mode' will enable it and disable the other checkers.
(define-minor-mode +emacs-lisp--flycheck-non-package-mode
""
:since "3.0.0"
:since "2.1.0"
(if (not +emacs-lisp--flycheck-non-package-mode)
(when (get 'flycheck-disabled-checkers 'initial-value)
(setq-local flycheck-disabled-checkers (get 'flycheck-disabled-checkers 'initial-value))
@ -413,7 +413,7 @@ Essentially, this means in any elisp file that either:
This generally applies to your private config (`doom-user-dir') or Doom's source
\(`doom-emacs-dir')."
:since "3.0.0"
:since "2.1.0"
(unless (and (or (bound-and-true-p flycheck-mode)
(bound-and-true-p flymake-mode))
(derived-mode-p 'emacs-lisp-mode)

View file

@ -2,7 +2,7 @@
;; DEPRECATED
;;;###autodef
(define-obsolete-function-alias 'set-pretty-symbols! 'set-ligatures! "3.0.0")
(define-obsolete-function-alias 'set-pretty-symbols! 'set-ligatures! "2.1.0")
;;;###autodef
(defun set-ligatures! (modes &rest plist)