emacs-29 1c05175c21a: Fix display of disabled-command help text

[Eli Zaretskii]

branch: emacs-29
commit 1c05175c21adc5e3af4ea518f25b76be4c60abed
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Fix display of disabled-command help text
    
    * lisp/novice.el (disabled-command-function): Improve wording, and
    make sure the prompt doesn't exceed one screen line, so that the
    mini-window is not resized (which gets in the way of fitting the
    window to the size of the help text), and the help text is fully
    visible when Emacs prompts for input.  (Bug#62146)
---
 lisp/novice.el | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lisp/novice.el b/lisp/novice.el
index c3549acef3e..18fb9f6c9fc 100644
--- a/lisp/novice.el
+++ b/lisp/novice.el
@@ -79,16 +79,16 @@ If nil, the feature is disabled, i.e., all commands work 
normally.")
 Do you want to use this command anyway?
 
 You can now type:
- \\`y'    to try it and enable it (no questions if you use it again).
- \\`n'    to cancel--don't try the command, and it remains disabled.
+ \\`n'    (also C-g) to cancel--don't try the command; it remains disabled.
+ \\`y'    to enable the command (no questions if you use it again).
  \\`SPC'  to try the command just this once, but leave it disabled.
- \\`!'    to try it, and enable all disabled commands for this session 
only.")))
+ \\`!'    to enable it and all the disabled commands for this session.")))
          (char
           (car (read-multiple-choice "Use this command?"
-                                     '((?y "yes")
-                                       (?n "no")
-                                       (?! "yes; enable for session")
-                                       (?\s "(space bar) yes; once"))
+                                     '((?n "no")
+                                       (?y "yes")
+                                       (?\s "(space bar) only once")
+                                       (?! "use and enable all"))
                                      help-string
                                      "*Disabled Command*"))))
     (pcase char