From: Stefan Kangas <stefan@marxist.se>
Date: Tue, 19 Oct 2021 23:52:26 +0000 (+0200)
Subject: Remove some XEmacs compat code from custom.el
X-Git-Tag: emacs-29.0.90~3671^2~487
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a4a35305101f24279d02d620a51b94b3e4682435;p=emacs.git

Remove some XEmacs compat code from custom.el

* lisp/custom.el (deftheme, custom-declare-theme): Remove XEmacs
compat code.
---

diff --git a/lisp/custom.el b/lisp/custom.el
index a04af9abaa5..d4f617d1703 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -1132,30 +1132,24 @@ list, in which A occurs before B if B was defined with a
 ;;   (provide-theme 'THEME)
 
 
-;; The IGNORED arguments to deftheme come from the XEmacs theme code, where
-;; they were used to supply keyword-value pairs like `:immediate',
-;; `:variable-reset-string', etc.  We don't use any of these, so ignore them.
-
-(defmacro deftheme (theme &optional doc &rest _ignored)
+(defmacro deftheme (theme &optional doc)
   "Declare THEME to be a Custom theme.
 The optional argument DOC is a doc string describing the theme.
 
 Any theme `foo' should be defined in a file called `foo-theme.el';
 see `custom-make-theme-feature' for more information."
   (declare (doc-string 2)
-           (indent 1)
-           (advertised-calling-convention (theme &optional doc) "22.1"))
+           (indent 1))
   (let ((feature (custom-make-theme-feature theme)))
     ;; It is better not to use backquote in this file,
     ;; because that makes a bootstrapping problem
     ;; if you need to recompile all the Lisp files using interpreted code.
     (list 'custom-declare-theme (list 'quote theme) (list 'quote feature) doc)))
 
-(defun custom-declare-theme (theme feature &optional doc &rest _ignored)
+(defun custom-declare-theme (theme feature &optional doc)
   "Like `deftheme', but THEME is evaluated as a normal argument.
 FEATURE is the feature this theme provides.  Normally, this is a symbol
 created from THEME by `custom-make-theme-feature'."
-  (declare (advertised-calling-convention (theme feature &optional doc) "22.1"))
   (unless (custom-theme-name-valid-p theme)
     (error "Custom theme cannot be named %S" theme))
   (unless (memq theme custom-known-themes)