Merge from origin/emacs-30

62b3d3136f Fix fns-tests-collate-strings failure with musl
840c682458 ; (completion-preview-complete): Fix bug#76606
fa42626a6a ; Fix indentation in cl.texi example
7ff806da49 ; Fix my last commit

doc/misc/cl.texi

@@ -611,7 +611,7 @@ For example:
 
 @example
 (cl-defmacro dolist ((var listform &optional resultform)
-                   &rest body)
+                     &rest body)
   @dots{})
 @end example
 

lisp/completion-preview.el

@@ -774,6 +774,10 @@ completions list."
             ;; hook update the completion preview in case the candidate
             ;; can be completed further.
             (when (functionp efn)
+              ;; Remove stale preview since `efn' can make arbitrary
+              ;; text and point modifications that might interfere with
+              ;; a subsequent preview update.  See bug#76606.
+              (completion-preview-active-mode -1)
               (funcall efn (concat base com) (if (cdr all) 'exact 'finished)))
           ;; Otherwise, remove the common prefix from the preview.
           (completion-preview--inhibit-update)

lisp/progmodes/elisp-mode.el

@@ -335,8 +335,8 @@ mouse-1: Enable lexical-binding mode"
 		      mouse-face mode-line-highlight
                       local-map ,elisp--dynlex-modeline-map)))
   "Major mode for editing Lisp code to run in Emacs.
-
-- Delete converts tabs to spaces as it moves back.
+\\<emacs-lisp-mode-map>
+- \\[backward-delete-char-untabify] converts tabs to spaces as it moves back.
 - Blank lines separate paragraphs.
 - Semicolons start comments.
 
@@ -1333,8 +1333,8 @@ Like Lisp mode except that \\[eval-print-last-sexp] evals the Lisp expression
 before point, and prints its value into the buffer, advancing point.
 Note that printing is controlled by `eval-expression-print-length'
 and `eval-expression-print-level'.
-
-- Delete converts tabs to spaces as it moves back.
+\\<lisp-interaction-mode-map>
+- \\[backward-delete-char-untabify] converts tabs to spaces as it moves back.
 - Paragraphs are separated only by blank lines.
 - Semicolons start comments.
 

test/src/fns-tests.el

@@ -277,7 +277,7 @@
   (should (string-collate-equalp "xyzzy" "XYZZY" nil t))
 
   ;; Locale must be valid.
-  (should-error (string-collate-equalp "xyzzy" "xyzzy" "en_XY.UTF-8")))
+  (should-error (string-collate-equalp "xyzzy" "xyzzy" 'not-a-locale)))
 
 ;; There must be a check for valid codepoints.  (Check not implemented yet)
 ;  (should-error