From 77243ba5be8c8e5319c4b07fabed6fee66e6ac7f Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 22 Dec 2024 12:06:38 +0200 Subject: [PATCH] ; Update version tags of defcustoms * admin/release-process: Expand on 'cusver-check'. * lisp/editorconfig.el (editorconfig-indentation-alist) (editorconfig-trim-whitespaces-mode): * lisp/eshell/em-cmpl.el (eshell-cmpl-remote-file-ignore): * lisp/eshell/esh-ext.el (eshell-explicit-remote-commands): * lisp/gnus/nnfeed.el (nnfeed-date-format): * lisp/net/newst-ticker.el (newsticker-ticker-period): * lisp/progmodes/cc-vars.el (c-warn-ids-with-dollar): * lisp/progmodes/cperl-mode.el (cperl-fontify-trailer): * lisp/progmodes/eglot.el (customize-package-emacs-version-alist) (eglot-events-buffer-config, eglot-confirm-server-edits) (eglot-prefer-plaintext): * lisp/progmodes/flymake.el (customize-package-emacs-version-alist): * lisp/progmodes/ruby-mode.el (ruby-rubocop-use-bundler): * lisp/progmodes/verilog-mode.el (verilog-indent-ignore-multiline-defines) (verilog-indent-ignore-regexp, verilog-indent-class-inside-pkg) (verilog-align-decl-expr-comments) (verilog-align-comment-distance, verilog-align-assign-expr) (verilog-align-typedef-regexp, verilog-align-typedef-words) (verilog-fontify-variables): * lisp/register.el (register-preview-display-buffer-alist): * lisp/vc/vc-annotate.el (vc-annotate-use-short-revision): Add missing :version tags and additions to 'customize-package-emacs-version-alist' as appropriate. --- admin/release-process | 14 +++++++++++++- lisp/editorconfig.el | 2 ++ lisp/eshell/em-cmpl.el | 3 ++- lisp/eshell/esh-ext.el | 1 + lisp/gnus/nnfeed.el | 1 + lisp/net/newst-ticker.el | 1 + lisp/progmodes/cc-vars.el | 1 + lisp/progmodes/cperl-mode.el | 1 + lisp/progmodes/eglot.el | 18 ++++++++++++++---- lisp/progmodes/flymake.el | 5 +++++ lisp/progmodes/ruby-mode.el | 1 + lisp/progmodes/verilog-mode.el | 9 +++++++++ lisp/register.el | 3 ++- lisp/vc/vc-annotate.el | 1 + 14 files changed, 54 insertions(+), 7 deletions(-) diff --git a/admin/release-process b/admin/release-process index ef698f51666..af1db4f53d8 100644 --- a/admin/release-process +++ b/admin/release-process @@ -93,7 +93,19 @@ documentation (or decide no updates are necessary) for those that aren't. ** For a major release, add a "New in Emacs XX" section to faq.texi. ** cusver-check from admin.el can help find new defcustoms missing -:version tags. +:version tags. This asks for new and old Lisp directories; use the one +in the current release branch as New and the one from the last released +Emacs version as Old. + +Note that this doesn't (yet) know about :package-version and +'customize-package-emacs-version-alist', so it could produce false +positives for packages that use :package-version. Make sure the files +with defcustoms that use :package-version have the appropriate +add-to-list that determines the correspondence between package versions +and Emacs versions. Any changes you make in :version etc. should be +tested by running "M-x customize-changed" after regenerating cus-load.el +(run "make custom-deps" in the lisp/ directory) and loaddefs.el (run +"make autoloads-force"). ** Manuals Check for node names using problematic characters: diff --git a/lisp/editorconfig.el b/lisp/editorconfig.el index c524945c4b9..007da79cf5e 100644 --- a/lisp/editorconfig.el +++ b/lisp/editorconfig.el @@ -274,6 +274,7 @@ a list of settings in the form (VARIABLE . VALUE)." (repeat (choice symbol (cons symbol integer))))) + :version "30.1" :risky t) (defcustom editorconfig-trim-whitespaces-mode nil @@ -281,6 +282,7 @@ a list of settings in the form (VARIABLE . VALUE)." If set, enable that mode when `trim_trailing_whitespace` is set to true. Otherwise, use `delete-trailing-whitespace'." + :version "30.1" :type 'symbol) (defvar editorconfig-properties-hash nil diff --git a/lisp/eshell/em-cmpl.el b/lisp/eshell/em-cmpl.el index 4c79f7b187a..fc40c295798 100644 --- a/lisp/eshell/em-cmpl.el +++ b/lisp/eshell/em-cmpl.el @@ -150,7 +150,8 @@ to writing a completion function." (defcustom eshell-cmpl-remote-file-ignore nil (eshell-cmpl--custom-variable-docstring 'pcomplete-remote-file-ignore) - :type (get 'pcomplete-remote-file-ignore 'custom-type)) + :type (get 'pcomplete-remote-file-ignore 'custom-type) + :version "30.1") (defcustom eshell-cmpl-ignore-case (eshell-under-windows-p) (eshell-cmpl--custom-variable-docstring 'completion-ignore-case) diff --git a/lisp/eshell/esh-ext.el b/lisp/eshell/esh-ext.el index cf93d2904da..38c8b5ac60a 100644 --- a/lisp/eshell/esh-ext.el +++ b/lisp/eshell/esh-ext.el @@ -171,6 +171,7 @@ These are commands with a full remote file name, such as commands on your local host by using the \"/local:\" prefix, like \"/local:whoami\"." :type 'boolean + :version "30.1" :group 'eshell-ext) ;;; Functions: diff --git a/lisp/gnus/nnfeed.el b/lisp/gnus/nnfeed.el index 2d33d4c813b..8e3e2e92e5b 100644 --- a/lisp/gnus/nnfeed.el +++ b/lisp/gnus/nnfeed.el @@ -64,6 +64,7 @@ (defcustom nnfeed-date-format "%F %X%p" "Format of displayed dates (see function `format-time-string')." + :version "30.1" :type 'string) (nnoo-declare nnfeed) diff --git a/lisp/net/newst-ticker.el b/lisp/net/newst-ticker.el index 01cd2964778..5c9fdb95950 100644 --- a/lisp/net/newst-ticker.el +++ b/lisp/net/newst-ticker.el @@ -96,6 +96,7 @@ retrieval interval (or the global `newsticker-retrieval-interval`) is recommended." :type 'number :set #'newsticker--set-customvar-ticker + :version "30.1" :group 'newsticker-ticker) (defcustom newsticker-scroll-smoothly diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el index 3845c2d55f0..68470cf1367 100644 --- a/lisp/progmodes/cc-vars.el +++ b/lisp/progmodes/cc-vars.el @@ -286,6 +286,7 @@ This has effect only for languages in which `c-dollar-in-ids' is non-nil, e.g. C, C++, Objective C. It covers languages where \"$\" is permitted in ids \"informally\", but only by some compilers." :type 'boolean + :version "30.1" :group 'c) (defcustom-c-stylevar c-basic-offset 4 diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index e129e2df552..0dbf879ffed 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -573,6 +573,7 @@ AutoSplit. If \"comment\", treat as comment, and do not look for imenu entries." :type '(choice (const perl-code) (const comment)) + :version "30.1" :group 'cperl-faces) (defcustom cperl-ps-print-face-properties diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el index 0a14146a245..9d656b352a4 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/eglot.el @@ -182,6 +182,13 @@ :prefix "eglot-" :group 'tools) +(add-to-list 'customize-package-emacs-version-alist + '(Eglot ("1.12" . "29.1") + ("1.12" . "29.2") + ("1.12" . "29.3") + ("1.12.29" . "29.4") + ("1.17.30" . "30.1"))) + (defun eglot-alternatives (alternatives) "Compute server-choosing function for `eglot-server-programs'. Each element of ALTERNATIVES is a string PROGRAM or a list of @@ -475,7 +482,8 @@ the LSP connection. That can be done by `eglot-reconnect'." (choice (const :tag "Full with original JSON" full) (const :tag "Shortened" short) - (const :tag "Pretty-printed lisp" lisp)))))) + (const :tag "Pretty-printed lisp" lisp))))) + :package-version '(Eglot . "1.17.30")) (defcustom eglot-confirm-server-edits '((eglot-rename . nil) (t . maybe-summary)) @@ -506,7 +514,8 @@ ACTION is the default value for commands not in the alist." (alist :tag "Per-command alist" :key-type (choice (function :tag "Command") (const :tag "Default" t)) - :value-type (choice . ,basic-choices))))) + :value-type (choice . ,basic-choices)))) + :package-version '(Eglot . "1.17.30")) (defcustom eglot-extend-to-xref nil "If non-nil, activate Eglot in cross-referenced non-project files." @@ -514,7 +523,8 @@ ACTION is the default value for commands not in the alist." (defcustom eglot-prefer-plaintext nil "If non-nil, always request plaintext responses to hover requests." - :type 'boolean) + :type 'boolean + :package-version '(Eglot . "1.17.30")) (defcustom eglot-menu-string "eglot" "String displayed in mode line when Eglot is active." @@ -530,7 +540,7 @@ the LSP connection. That can be done by `eglot-reconnect'." :type '(choice (const :tag "Don't show progress" nil) (const :tag "Show progress in *Messages*" messages) (const :tag "Show progress in Eglot's mode line indicator" t)) - :version "1.10") + :package-version '(Eglot . "1.10")) (defcustom eglot-ignored-server-capabilities (list) "LSP server capabilities that Eglot could use, but won't. diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el index 9a6b62ca254..aae1f8b7262 100644 --- a/lisp/progmodes/flymake.el +++ b/lisp/progmodes/flymake.el @@ -128,6 +128,11 @@ :link '(custom-manual "(flymake) Top") :group 'tools) +(add-to-list 'customize-package-emacs-version-alist + '(Flymake ("1.3.4" . "30.1") + ("1.3.5" . "30.1") + ("1.3.6" . "30.1"))) + (defcustom flymake-error-bitmap '(flymake-double-exclamation-mark compilation-error) "Bitmap (a symbol) used in the fringe for indicating errors. diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el index 4c37ef45ddf..45e6e37ceb2 100644 --- a/lisp/progmodes/ruby-mode.el +++ b/lisp/progmodes/ruby-mode.el @@ -2584,6 +2584,7 @@ the gem \"rubocop\". When t, it is used unconditionally." :type '(choice (const :tag "Always" t) (const :tag "No" nil) (const :tag "If rubocop is in Gemfile" check)) + :version "30.1" :safe 'booleanp) (defun ruby-flymake-rubocop (report-fn &rest _args) diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el index 65545d523a8..495bd312c4e 100644 --- a/lisp/progmodes/verilog-mode.el +++ b/lisp/progmodes/verilog-mode.el @@ -691,12 +691,14 @@ Set to 0 to have all directives start at the left side of the screen." (defcustom verilog-indent-ignore-multiline-defines t "Non-nil means ignore indentation on lines that are part of a multiline define." :group 'verilog-mode-indent + :version "30.1" :type 'boolean) (put 'verilog-indent-ignore-multiline-defines 'safe-local-variable #'verilog-booleanp) (defcustom verilog-indent-ignore-regexp nil "Regexp that matches lines that should be ignored for indentation." :group 'verilog-mode-indent + :version "30.1" :type 'boolean) (put 'verilog-indent-ignore-regexp 'safe-local-variable #'stringp) @@ -748,6 +750,7 @@ Otherwise, line them up." "Non-nil means indent classes inside packages. Otherwise, classes have zero indentation." :group 'verilog-mode-indent + :version "30.1" :type 'boolean) (put 'verilog-indent-class-inside-pkg 'safe-local-variable #'verilog-booleanp) @@ -761,6 +764,7 @@ Otherwise else is lined up with first character on line holding matching if." (defcustom verilog-align-decl-expr-comments t "Non-nil means align declaration and expressions comments." :group 'verilog-mode-indent + :version "30.1" :type 'boolean) (put 'verilog-align-decl-expr-comments 'safe-local-variable #'verilog-booleanp) @@ -768,18 +772,21 @@ Otherwise else is lined up with first character on line holding matching if." "Distance (in spaces) between longest declaration/expression and comments. Only works if `verilog-align-decl-expr-comments' is non-nil." :group 'verilog-mode-indent + :version "30.1" :type 'integer) (put 'verilog-align-comment-distance 'safe-local-variable #'integerp) (defcustom verilog-align-assign-expr nil "Non-nil means align expressions of continuous assignments." :group 'verilog-mode-indent + :version "30.1" :type 'boolean) (put 'verilog-align-assign-expr 'safe-local-variable #'verilog-booleanp) (defcustom verilog-align-typedef-regexp nil "Regexp that matches user typedefs for declaration alignment." :group 'verilog-mode-indent + :version "30.1" :type '(choice (regexp :tag "Regexp") (const :tag "None" nil))) (put 'verilog-align-typedef-regexp 'safe-local-variable #'stringp) @@ -787,6 +794,7 @@ Only works if `verilog-align-decl-expr-comments' is non-nil." (defcustom verilog-align-typedef-words nil "List of words that match user typedefs for declaration alignment." :group 'verilog-mode-indent + :version "30.1" :type '(repeat string)) (put 'verilog-align-typedef-words 'safe-local-variable #'listp) @@ -939,6 +947,7 @@ always be saved." (defcustom verilog-fontify-variables t "Non-nil means fontify declaration variables." :group 'verilog-mode-actions + :version "30.1" :type 'boolean) (put 'verilog-fontify-variables 'safe-local-variable #'verilog-booleanp) diff --git a/lisp/register.el b/lisp/register.el index 497848ded1e..9bcd6e21057 100644 --- a/lisp/register.el +++ b/lisp/register.el @@ -409,7 +409,8 @@ Format of each entry is controlled by the variable `register-preview-function'." (window-height . fit-window-to-buffer) (preserve-size . (nil . t))) "Window configuration for the register preview buffer." - :type display-buffer--action-custom-type) + :type display-buffer--action-custom-type + :version "30.1") (defun register-preview-1 (buffer &optional show-empty types) "Pop up a window showing the preview of registers in BUFFER. diff --git a/lisp/vc/vc-annotate.el b/lisp/vc/vc-annotate.el index b206abec27f..8b4c6be422b 100644 --- a/lisp/vc/vc-annotate.el +++ b/lisp/vc/vc-annotate.el @@ -165,6 +165,7 @@ List of factors, used to expand/compress the time scale. See `vc-annotate'." (defcustom vc-annotate-use-short-revision t "If non-nil, \\[vc-annotate] will use short revisions in its buffer name." :type 'boolean + :version "30.1" :group 'vc) (defvar-keymap vc-annotate-mode-map