Merge from origin/emacs-30

2ba6387d1d6 ; Fix inaccuracy in ELisp Reference manual
8ac6a178804 ; * etc/PROBLEMS: Mention problems with XPM support in GD...
624322d5f6a Add missing fontification matches for elixir-ts-mode
5bafb11b400 ; Fix copyright year
186ea407326 Don't start docstrings with "This function" or similar
cb8ce2e68bb Enable indent-tabs-mode in obj-c-mode
54f35137096 Fix comment indent in 'lua-ts-mode' and old grammar
8b95549e908 * admin/nt/dist-build/build-dep-zips.py: (deps src) handl...
8064b2a6798 Document undocumented completion commands
c29b798537e ; etc/w32-feature.el (harfbuzz): improve test
0e43e35f96e * admin/nt/dist-build/emacs.nsi: (Uninstall) delete only ...
b83cd8a8fb0 ; * etc/tutorials/TUTORIAL.ko: Fix the beginning.
41caccc488b ; * etc/publicsuffix.txt: Update from upstream.
e6fb18406ee ; Fix refcards
14e791f9ba2 ; Update acknowledgments for Emacs 30
861b7864fc4 ; Fix node name in emacs-lisp-intro.texi
77243ba5be8 ; Update version tags of defcustoms
fe2ac33bae8 ;* doc/misc/efaq.texi (New in Emacs 30): Mention 'trusted...
8fb884f0dc0 ; * etc/NEWS: Fix wording.
e281355a5e8 Improve D-Bus and Tramp manual

# Conflicts:
#	doc/emacs/emacs.texi
#	etc/NEWS
#	lisp/erc/erc-log.el
#	lisp/eshell/esh-mode.el
#	lisp/which-key.el

28 files changed, 79 insertions, 40 deletions

diff --git a/lisp/editorconfig.el b/lisp/editorconfig.el
index fbc7a59d823..666df9941c8 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-local editorconfig-properties-hash nil
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index 098cf6d7d71..dc64b8bebc8 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -571,7 +571,7 @@ If this is set to nil, never try to reconnect."
                  (integer :tag "Seconds")))
 
 (defvar-local erc-server-ping-handler nil
-  "This variable holds the periodic ping timer.")
+  "The periodic server ping timer.")
 
 ;;;; Helper functions
 
diff --git a/lisp/erc/erc-log.el b/lisp/erc/erc-log.el
index a1102ebdcdf..69da188ea4f 100644
--- a/lisp/erc/erc-log.el
+++ b/lisp/erc/erc-log.el
@@ -360,13 +360,13 @@ The result is converted to lowercase, as IRC is case-insensitive."
          erc-log-channels-directory)))))
 
 (defun erc-generate-log-file-name-with-date (buffer &rest _ignore)
-  "Compute a short log file name with the current date.
+  "Return a short log file name with the current date.
 The name of the log file is composed of BUFFER and the current date.
 This function is a possible value for `erc-generate-log-file-name-function'."
   (concat (buffer-name buffer) "-" (format-time-string "%Y-%m-%d") ".txt"))
 
 (defun erc-generate-log-file-name-short (buffer &rest _ignore)
-  "Compute a short log file name.
+  "Return a short log file name.
 In fact, it only uses the buffer name of the BUFFER argument, so
 you can affect that using `rename-buffer' and the-like.  This
 function is a possible value for
diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el
index fac0269f9e8..6191ec32182 100644
--- a/lisp/erc/erc-track.el
+++ b/lisp/erc/erc-track.el
@@ -140,7 +140,7 @@ This setting is used by `erc-track-shorten-names'."
                  (const :tag "Max" max)))
 
 (defcustom erc-track-shorten-function 'erc-track-shorten-names
-  "This function will be used to reduce the channel names before display.
+  "Function used to reduce the channel names before display.
 It takes one argument, CHANNEL-NAMES which is a list of strings.
 It should return a list of strings of the same number of elements.
 If nil instead of a function, shortening is disabled."
diff --git a/lisp/eshell/em-cmpl.el b/lisp/eshell/em-cmpl.el
index ef931db62b2..f8226375f83 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/em-smart.el b/lisp/eshell/em-smart.el
index 670b956476d..c49b6a9caa3 100644
--- a/lisp/eshell/em-smart.el
+++ b/lisp/eshell/em-smart.el
@@ -150,7 +150,7 @@ buffer using \\[end-of-buffer]."
   :group 'eshell-smart)
 
 (defcustom eshell-where-to-jump 'begin
-  "This variable indicates where point should jump to after a command.
+  "The location where point should jump to after a command.
 The options are `begin', `after' or `end'."
   :type '(radio (const :tag "Beginning of command" begin)
                 (const :tag "After command word" after)
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/eshell/esh-mode.el b/lisp/eshell/esh-mode.el
index 4f94934fccd..f4a405bfbfc 100644
--- a/lisp/eshell/esh-mode.el
+++ b/lisp/eshell/esh-mode.el
@@ -537,7 +537,7 @@ Putting this function on `eshell-pre-command-hook' will mimic Plan 9's
     (eshell-interactive-output-filter nil string)))
 
 (defsubst eshell-begin-on-new-line ()
-  "Print a newline if not at beginning of line."
+  "Output a newline if not at beginning of line."
   (save-excursion
     (goto-char eshell-last-output-end)
     (or (bolp)
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 8243e4e632b..45f23e16475 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -512,7 +512,7 @@ might have."
   :type 'boolean)
 
 (defcustom gnus-prompt-before-saving 'always
-  "This variable says how much prompting is to be done when saving articles.
+  "How much prompting to do when saving articles.
 If it is nil, no prompting will be done, and the articles will be
 saved to the default files.  If this variable is `always', each and
 every article that is saved will be preceded by a prompt, even when
diff --git a/lisp/gnus/nnfeed.el b/lisp/gnus/nnfeed.el
index e8c1fdb8e2b..5fd25dd5ac8 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/mail/supercite.el b/lisp/mail/supercite.el
index a3b5542bfdc..f9a31aef039 100644
--- a/lisp/mail/supercite.el
+++ b/lisp/mail/supercite.el
@@ -236,7 +236,7 @@ See the variable `sc-cite-frame-alist' for details."
   :group 'supercite-frames)
 
 (defcustom sc-cite-region-limit t
-  "This variable controls automatic citation of yanked text.
+  "Size limit for automatic citation of yanked text.
 Valid values are:
 
 non-nil   -- cite the entire region, regardless of its size
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 39e7a399404..cd3c9e00bf7 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -5039,9 +5039,9 @@ contents."
     (error (minibuffer-complete-and-exit))))
 
 (defun minibuffer-complete-history ()
-  "Complete the minibuffer history as far as possible.
-Like `minibuffer-complete' but completes on the history items
-instead of the default completion table."
+  "Complete as far as possible using the minibuffer history.
+Like `minibuffer-complete' but completes using the history of minibuffer
+inputs for the prompting command, instead of the default completion table."
   (interactive)
   (let* ((history (symbol-value minibuffer-history-variable))
          (completions
@@ -5062,9 +5062,9 @@ instead of the default completion table."
                       (cycle-sort-function . identity)))))))
 
 (defun minibuffer-complete-defaults ()
-  "Complete minibuffer defaults as far as possible.
-Like `minibuffer-complete' but completes on the default items
-instead of the completion table."
+  "Complete as far as possible using the minibuffer defaults.
+Like `minibuffer-complete' but completes using the default items
+provided by the prompting command, instead of the completion table."
   (interactive)
   (when (and (not minibuffer-default-add-done)
              (functionp minibuffer-default-add-function))
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/net/nsm.el b/lisp/net/nsm.el
index 33eb4986bb7..03e1dee02ba 100644
--- a/lisp/net/nsm.el
+++ b/lisp/net/nsm.el
@@ -154,17 +154,16 @@ If WARN-UNENCRYPTED, query the user if the connection is unencrypted."
     (dhe-kx                 high)
     (rsa-kx                 high)
     (cbc-cipher             high))
-  "This variable specifies what TLS connection checks to perform.
-It's an alist where the key is the name of the check, and the
-value is the minimum security level the check should begin.
-
-Each check function is called with the parameters HOST PORT
-STATUS SETTINGS.  HOST is the host domain, PORT is a TCP port
-number, STATUS is the peer status returned by
-`gnutls-peer-status', and SETTINGS is the persistent and session
-settings for the host HOST.  Please refer to the contents of
-`nsm-settings-file' for details.  If a problem is found, the check
-function is required to return an error message, and nil
+  "Alist of TLS connection checks to perform.
+The key is the name of the check, and the value is the minimum security
+level the check should begin.
+
+Each check function is called with the parameters HOST PORT STATUS
+SETTINGS.  HOST is the host domain, PORT is a TCP port number, STATUS is
+the peer status returned by `gnutls-peer-status', and SETTINGS is the
+persistent and session settings for the host HOST.  Please refer to the
+contents of `nsm-settings-file' for details.  If a problem is found, the
+check function is required to return an error message, and nil
 otherwise.
 
 See also: `nsm-check-tls-connection', `nsm-save-host-names',
diff --git a/lisp/org/org-element.el b/lisp/org/org-element.el
index d184165f6cb..d41f75aa35d 100644
--- a/lisp/org/org-element.el
+++ b/lisp/org/org-element.el
@@ -7259,7 +7259,7 @@ that range.  See `after-change-functions' for more information."
               #'org-element--cache-after-change -1 t)))
 
 (defvar org-element--cache-avoid-synchronous-headline-re-parsing nil
-  "This variable controls how buffer changes are handled by the cache.
+  "How buffer changes are handled by the cache.
 
 By default (when this variable is nil), cache re-parses modified
 headlines immediately after modification preserving all the unaffected
diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el
index f0e4c957ea5..dac60c94085 100644
--- 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 9fb498bfff4..60dc2667750 100644
--- 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 816a1e67eca..24d8ea52a83 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/elixir-ts-mode.el b/lisp/progmodes/elixir-ts-mode.el
index 23ad04a662d..d0a692a214b 100644
--- a/lisp/progmodes/elixir-ts-mode.el
+++ b/lisp/progmodes/elixir-ts-mode.el
@@ -475,7 +475,8 @@
 
    :language 'elixir
    :feature 'elixir-data-type
-   '([(atom) (alias)] @font-lock-type-face
+   '((alias) @font-lock-type-face
+     (atom) @elixir-ts-atom
      (keywords (pair key: (keyword) @elixir-ts-keyword-key))
      [(keyword) (quoted_keyword)] @elixir-ts-atom
      [(boolean) (nil)] @elixir-ts-atom
@@ -540,6 +541,10 @@
      (unary_operator operand: (identifier) @font-lock-variable-use-face)
      (interpolation (identifier) @font-lock-variable-use-face)
      (do_block (identifier) @font-lock-variable-use-face)
+     (rescue_block (identifier) @font-lock-variable-use-face)
+     (catch_block (identifier) @font-lock-variable-use-face)
+     (else_block (identifier) @font-lock-variable-use-face)
+     (after_block (identifier) @font-lock-variable-use-face)
      (access_call target: (identifier) @font-lock-variable-use-face)
      (access_call "[" key: (identifier) @font-lock-variable-use-face "]"))
 
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 3dee1a58e44..9b39e974f1e 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/lua-ts-mode.el b/lisp/progmodes/lua-ts-mode.el
index 6fa3e51b34b..857be185fcf 100644
--- a/lisp/progmodes/lua-ts-mode.el
+++ b/lisp/progmodes/lua-ts-mode.el
@@ -281,7 +281,7 @@ values of OVERRIDE."
           lua-ts--multi-line-comment-start
           (parent-is "comment_content")
           (parent-is "string_content")
-          (node-is "]]"))
+          (or (node-is "]]") (node-is "comment_end")))
       no-indent 0)
      ((and (n-p-gp "field" "table_constructor" "arguments")
            lua-ts--multi-arg-function-call-matcher
diff --git a/lisp/progmodes/modula2.el b/lisp/progmodes/modula2.el
index 2bb31988290..3950443c01e 100644
--- a/lisp/progmodes/modula2.el
+++ b/lisp/progmodes/modula2.el
@@ -97,7 +97,7 @@
   "C-c C-c" #'m2-compile)
 
 (defcustom m2-indent 5
-  "This variable gives the indentation in Modula-2 mode."
+  "Indentation in Modula-2 mode."
   :type 'integer
   :safe (lambda (v) (or (null v) (integerp v))))
 
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 58dc234adfe..c9c0840c9db 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/progmodes/xscheme.el b/lisp/progmodes/xscheme.el
index 598328dddea..b9c2ea95169 100644
--- a/lisp/progmodes/xscheme.el
+++ b/lisp/progmodes/xscheme.el
@@ -55,8 +55,8 @@
   "The tail of the Scheme expressions ring whose car is the last thing yanked.")
 
 (defvar-local xscheme-running-p nil
-  "This variable, if nil, indicates that the scheme process is
-waiting for input.  Otherwise, it is busy evaluating something.")
+  "If nil, the scheme process is waiting for input.
+Otherwise, it is busy evaluating something.")
 
 (defconst xscheme-control-g-synchronization-p t
   "If non-nil, insert markers in the scheme input stream to indicate when
@@ -64,8 +64,8 @@ control-g interrupts were signaled.  Do not allow more control-g's to be
 signaled until the scheme process acknowledges receipt.")
 
 (defvar-local xscheme-control-g-disabled-p nil
-  "This variable, if non-nil, indicates that a control-g is being processed
-by the scheme process, so additional control-g's are to be ignored.")
+  "If non-nil, a control-g is being processed by the scheme process, so
+additional control-g's are to be ignored.")
 
 (defvar xscheme-string-receiver nil
   "Procedure to send the string argument from the scheme process.")
diff --git a/lisp/register.el b/lisp/register.el
index 407fd8a8779..3bf5e6cdf43 100644
--- a/lisp/register.el
+++ b/lisp/register.el
@@ -422,7 +422,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
diff --git a/lisp/which-key.el b/lisp/which-key.el
index 6d3d5efdd03..484f34d102c 100644
--- a/lisp/which-key.el
+++ b/lisp/which-key.el
@@ -1220,7 +1220,7 @@ total height."
 ;;; Show/hide which-key buffer
 
 (defun which-key--hide-popup ()
-  "Hide the `which-key' buffer."
+  "Hide the which-key buffer."
   (unless (or which-key-persistent-popup
               (member real-this-command which-key--paging-functions))
     (setq which-key--last-try-2-loc nil)