; 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.

(cherry picked from commit 77243ba5be8c8e5319c4b07fabed6fee66e6ac7f)

diff --git a/admin/release-process b/admin/release-process
index ef698f51666a5fa8dc940aa53e2e5c54cc89f8d0..af1db4f53d8e5c6ea25028819cb2f9439e44701f 100644 (file)
--- 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 7a89b964d28f0b604fab09ac5063ce307b860db6..067790f2a65678b43a24de8b883e23ae9490cdf4 100644 (file)
--- a/lisp/editorconfig.el
+++ b/lisp/editorconfig.el
@@ -268,6 +268,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
@@ -275,6 +276,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-local editorconfig-properties-hash nil

diff --git a/lisp/eshell/em-cmpl.el b/lisp/eshell/em-cmpl.el
index ef931db62b206e0030a0e8992d3da5812781aa80..f8226375f83f68b84a4b55b61a9a33ad93e50e7c 100644 (file)
--- 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 cf93d2904da8ca870a933bdbb62e4c55a7477015..38c8b5ac60aa995be75ceb81d46ba7405211e942 100644 (file)
--- 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 2d33d4c813b26b9891410646f47d98ad81e6573e..8e3e2e92e5bb9345f1ad7dc77522738a8876cd0b 100644 (file)
--- 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 01cd2964778e95f233de315b386b9f75dad62dde..5c9fdb95950d5fdd4e46523471c84db1e0c2614f 100644 (file)
--- 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 f0e4c957ea5c0ef5a5de3e168c9442a0c45d0730..dac60c9408536efd44db3cb68cdefe5507033e55 100644 (file)
--- a/lisp/progmodes/cc-vars.el
+++ b/lisp/progmodes/cc-vars.el
@@ -474,6 +474,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 ba78f66c652e4ee942fc4c303b4ab1192a8537f4..b6ea99efde8a9f26fb299d2c19a694794c3fcbbf 100644 (file)
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -583,6 +583,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 801d60885f576421759ea08b429ec3ca97bd2a18..2304b65f538adcd82ed2f4799cb99b8d3050c73b 100644 (file)
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -180,6 +180,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
@@ -473,7 +480,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))
@@ -504,7 +512,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."
@@ -512,7 +521,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."
@@ -528,7 +538,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 95879ea338e48ec6fe9ebf2368bf1cb1ae4b3c8d..066b5ff86d0472b6117dd5bc5d8731022c043bbf 100644 (file)
--- 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 81def2d79a56e95ae9589b3723b05942a3949e19..8d0095fe1a9d5f3088bdb290a3bcde939d8cc688 100644 (file)
--- 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/vc/vc-annotate.el b/lisp/vc/vc-annotate.el
index b206abec27f2ca231e8d55582c26ece55679a6d6..8b4c6be422b0b6bc5baed46ee0248a23bae7ac07 100644 (file)
--- 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