master 99884c2: Merge from origin/emacs-28

[Glenn Morris]

branch: master
commit 99884c2264715b3ff811320a859d644db08ea90e
Merge: 8968bf8 626696c
Author: Glenn Morris <rgm@gnu.org>
Commit: Glenn Morris <rgm@gnu.org>

    Merge from origin/emacs-28
    
    626696c3c8 (origin/emacs-28) * doc/lispref/control.texi (pcase Macro)...
    2895cb8d49 ; * lisp/time-stamp.el: Fix wording in some documentation ...
    1e79c9e9c0 ; * admin/release-branch.txt: Small edits.
    f1f57a541e Fix some custom types
---
 admin/release-branch.txt | 6 +++---
 doc/lispref/control.texi | 2 +-
 lisp/mpc.el              | 2 +-
 lisp/org/oc-csl.el       | 4 ++--
 lisp/org/org-plot.el     | 2 +-
 lisp/time-stamp.el       | 6 +++---
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/admin/release-branch.txt b/admin/release-branch.txt
index 2be0495..3318d8d 100644
--- a/admin/release-branch.txt
+++ b/admin/release-branch.txt
@@ -1,9 +1,9 @@
 Instructions for cutting the Emacs release branch
 
 1.  In the clone of the Emacs Git repository, switch to the 'master'
-    branch, "git pull", and build it to make sure it's not broken.
-    Consider deleting all the *.elc and *.o files, or running the
-    command "make extraclean", before building.
+    branch, "git pull", and build it (using 'make bootstrap') to make
+    sure it's not broken.  Run 'make check-expensive' and ensure all
+    tests pass.
 
 2.  Create the release branch and switch to it.  Assuming that it is
     for releasing Emacs versions XY.1, XY.2, etc., the command is:
diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi
index aacf66c..30676f0 100644
--- a/doc/lispref/control.texi
+++ b/doc/lispref/control.texi
@@ -557,7 +557,7 @@ Likewise, it makes no sense to bind keyword symbols
 
 @item (cl-type @var{type})
 Matches if @var{expval} is of type @var{type}, which is a type
-descriptor as accepted by @code{cl-typep} (@pxref{cl-typep,,,cl,Common
+descriptor as accepted by @code{cl-typep} (@pxref{Type Predicates,,,cl,Common
 Lisp Extensions}).  Examples:
 
 @lisp
diff --git a/lisp/mpc.el b/lisp/mpc.el
index 9131464..c47d433 100644
--- a/lisp/mpc.el
+++ b/lisp/mpc.el
@@ -964,7 +964,7 @@ If PLAYLIST is t or nil or missing, use the main playlist."
 
 (defcustom mpc-cover-image-re nil ; (rx (or ".jpg" ".jpeg" ".png") string-end)
   "If non-nil, it is a regexp that should match a valid cover image."
-  :type '(regexp)
+  :type '(choice (const nil) regexp)
   :version "28.1")
 
 (defun mpc-secs-to-time (secs)
diff --git a/lisp/org/oc-csl.el b/lisp/org/oc-csl.el
index 50df121..5623efc 100644
--- a/lisp/org/oc-csl.el
+++ b/lisp/org/oc-csl.el
@@ -123,7 +123,7 @@ If nil then only the fallback en-US locale will be 
available."
   :group 'org-cite
   :package-version '(Org . "9.5")
   :type '(choice
-          (dir :tag "Locales directory")
+          (directory :tag "Locales directory")
           (const :tag "Use en-US locale only" nil))
   :safe t)
 
@@ -134,7 +134,7 @@ directory.  This variable is ignored when style file is 
absolute."
   :group 'org-cite
   :package-version '(Org . "9.5")
   :type '(choice
-          (dir :tag "Styles directory")
+          (directory :tag "Styles directory")
           (const :tag "Use absolute file names" nil))
   :safe t)
 
diff --git a/lisp/org/org-plot.el b/lisp/org/org-plot.el
index 63176fc..4f14c7d 100644
--- a/lisp/org/org-plot.el
+++ b/lisp/org/org-plot.el
@@ -392,7 +392,7 @@ be set.
    Accepts string, nil, or lambda function which returns string
    or nil.  Defaults to nil."
   :group 'org-plot
-  :type '(alist :value-type (symbol group)))
+  :type 'alist)
 
 (defvar org--plot/radar-template
   "### spider plot/chart with gnuplot
diff --git a/lisp/time-stamp.el b/lisp/time-stamp.el
index 6637732..e1ea922 100644
--- a/lisp/time-stamp.el
+++ b/lisp/time-stamp.el
@@ -138,7 +138,7 @@ Its format is that of the ZONE argument of the 
`format-time-string' function."
 
 ;;;###autoload
 (defun time-stamp-zone-type-p (zone)
-  "Return whether or not ZONE is of the correct type for a timezone rule.
+  "Return non-nil if ZONE is of the correct type for a timezone rule.
 Valid ZONE values are described in the documentation of `format-time-string'."
   (or (memq zone '(nil t wall))
       (stringp zone)
@@ -313,7 +313,7 @@ this line to a local variables list near the end of the 
file:
 
 If the file has no time-stamp template, this function does nothing.
 
-You can set `time-stamp-pattern' in a files's local variables list
+You can set `time-stamp-pattern' in a file's local variables list
 to customize the information in the time stamp and where it is written.
 
 The time stamp is updated only if `time-stamp-active' is non-nil."
@@ -712,7 +712,7 @@ and all `time-stamp-format' compatibility."
 
 (defun time-stamp-do-number (format-char alt-form field-width time)
   "Handle compatible FORMAT-CHAR where only default width/padding will change.
-ALT-FORM is whether `#' specified.  FIELD-WIDTH is the string
+ALT-FORM is whether `#' was specified.  FIELD-WIDTH is the string
 width specification or \"\".  TIME is the time to convert.
 This is an internal helper for `time-stamp-string-preprocess'."
   (let ((format-string (concat "%" (char-to-string format-char))))