[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master a53c34d76a 1/2: Don't quote the `when' form in obsoletions
From: |
Lars Ingebrigtsen |
Subject: |
master a53c34d76a 1/2: Don't quote the `when' form in obsoletions |
Date: |
Fri, 17 Jun 2022 12:13:15 -0400 (EDT) |
branch: master
commit a53c34d76a09cd6519d2d176b76d4b820bc26a51
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>
Don't quote the `when' form in obsoletions
* lisp/emacs-lisp/byte-run.el (byte-run--set-obsolete): The `when'
is a string (or nil), so don't quote it (bug#48145).
* lisp/emacs-lisp/loaddefs-gen.el (loaddefs-generate--print-form):
Adjust folding.
---
lisp/emacs-lisp/byte-run.el | 2 +-
lisp/emacs-lisp/loaddefs-gen.el | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index 17c1554966..498435c58d 100644
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -166,7 +166,7 @@ The return value of this function is not used."
(defalias 'byte-run--set-obsolete
#'(lambda (f _args new-name when)
(list 'make-obsolete
- (list 'quote f) (list 'quote new-name) (list 'quote when))))
+ (list 'quote f) (list 'quote new-name) when)))
(defalias 'byte-run--set-interactive-only
#'(lambda (f _args instead)
diff --git a/lisp/emacs-lisp/loaddefs-gen.el b/lisp/emacs-lisp/loaddefs-gen.el
index 86c776e301..a686de406a 100644
--- a/lisp/emacs-lisp/loaddefs-gen.el
+++ b/lisp/emacs-lisp/loaddefs-gen.el
@@ -633,6 +633,7 @@ If GENERATE-FULL, don't update, but regenerate all the
loaddefs files."
"Print DEF in the way make-docfile.c expects it."
(if (or (not (consp def))
(not (symbolp (car def)))
+ (eq (car def) 'make-obsolete)
(not (stringp (nth 3 def))))
(prin1 def (current-buffer) t)
;; The salient point here is that we have to have the doc string