Merge from savannah/emacs-30

a1b8c2610a * lisp/help-macro.el: Add 'help-for-help-use-variable-pit...
a577eccdbb ; * doc/lispref/strings.texi (String Conversion): Fix las...
d22e52375a Remove manual entry for string-to-int
341e5795d5 Support minibuffer-visible-completions in completing-read...
3e30c779a7 * lisp/imenu.el (imenu-flatten): Fix doc about annotation...

doc/lispref/strings.texi

@@ -888,9 +888,6 @@ interpreted as a number, this function returns 0.
 (string-to-number "1e5")
      @result{} 100000.0
 @end example
-
-@findex string-to-int
-@code{string-to-int} is an obsolete alias for this function.
 @end defun
 
 @defun char-to-string character

lisp/emacs-lisp/crm.el

@@ -238,6 +238,11 @@ with empty strings removed."
   (let* ((map (if require-match
                   crm-local-must-match-map
                 crm-local-completion-map))
+         (map (if minibuffer-visible-completions
+                  (make-composed-keymap
+                   (list minibuffer-visible-completions-map
+                         map))
+                map))
          input)
     (minibuffer-with-setup-hook
         (lambda ()

lisp/help-macro.el

@@ -78,6 +78,12 @@ gives the window that lists the options."
   :type 'boolean
   :group 'help)
 
+(defcustom help-for-help-use-variable-pitch t
+  "If non-nil, `help-for-help' should use `variable-pitch-mode'."
+  :type 'boolean
+  :version "30.1"
+  :group 'help)
+
 (defmacro make-help-screen (fname help-line help-text helped-map
                                   &optional buffer-name)
   "Construct help-menu function name FNAME.
@@ -146,7 +152,8 @@ and then returns."
                 (insert (substitute-command-keys help-screen)))
               (let ((minor-mode-map-alist new-minor-mode-map-alist))
                 (help-mode)
-                (variable-pitch-mode)
+                (when help-for-help-use-variable-pitch
+                  (variable-pitch-mode))
                 (setq new-minor-mode-map-alist minor-mode-map-alist))
               (goto-char (point-min))
               (while (or (memq char (append help-event-list

lisp/imenu.el

@@ -158,6 +158,9 @@ If the value is `annotation', annotate each completion candidate
 with a suffix that is the section name to which it belongs.
 If the value is `group', split completion candidates into groups
 according to the sections.
+Since the values `annotation' and `group' rely on text properties,
+you can use them only by selecting candidates from the completions
+buffer, not by typing in the minibuffer.
 Any other value is treated as `prefix'.
 
 The value of `imenu-level-separator', a string, is used to separate