Merge from origin/emacs-30

a2bfce5d2a7 ; Fix customization and doc strings in pp.el

1 files changed, 4 insertions, 4 deletions

diff --git a/lisp/emacs-lisp/pp.el b/lisp/emacs-lisp/pp.el
index c183f442d8d..01dc95e649b 100644
--- a/lisp/emacs-lisp/pp.el
+++ b/lisp/emacs-lisp/pp.el
@@ -71,9 +71,9 @@ Lisp syntax."
           (const :tag "Emacs<29 algorithm, fast and good enough" pp-28)
           (const :tag "Work hard for code (slow on large inputs)"
                  pp-emacs-lisp-code)
-          (const :tag "`pp-emacs-lisp-code' if `pp-use-max-width' else `pp-28'"
+          (const :tag "Work hard for code if `pp-use-max-width' non-nil, else as in Emacs<29"
                  pp-29)
-          function)
+          (function :tag "Custom function"))
   :version "30.1")
 
 (defvar pp--inhibit-function-formatting nil)
@@ -123,7 +123,7 @@ and should pretty print it at point into the current buffer."
 
 (defun pp-29 (beg-or-sexp &optional end) ;FIXME: Better name?
   "Prettify the current region with printed representation of a Lisp object.
-Uses the pretty-printing algorithm that was standard in Emacs-29,
+Uses the pretty-printing algorithm that was standard in Emacs 29,
 which, depending on `pp-use-max-width', will either use `pp-28'
 or `pp-emacs-lisp-code'."
   (if pp-use-max-width
@@ -278,7 +278,7 @@ it inserts and pretty-prints that arg at point."
 
 (defun pp-28 (beg &optional end)        ;FIXME: Better name?
   "Prettify the current region with printed representation of a Lisp object.
-Uses the pretty-printing algorithm that was standard before Emacs-30.
+Uses the pretty-printing algorithm that was standard before Emacs 30.
 Non-interactively can also be called with a single argument, in which
 case that argument will be inserted pretty-printed at point."
   (interactive "r")