diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi index df67478a5aa..12a6c45b78c 100644 --- a/doc/misc/cl.texi +++ b/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 diff --git a/lisp/completion-preview.el b/lisp/completion-preview.el index b2efb8caf62..0119ddad1d6 100644 --- a/lisp/completion-preview.el +++ b/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) diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el index 502292428b2..934f095f988 100644 --- a/lisp/progmodes/elisp-mode.el +++ b/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. +\\ +- \\[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. +\\ +- \\[backward-delete-char-untabify] converts tabs to spaces as it moves back. - Paragraphs are separated only by blank lines. - Semicolons start comments. diff --git a/test/src/fns-tests.el b/test/src/fns-tests.el index 3d6cd5de8fe..e97ae275da6 100644 --- a/test/src/fns-tests.el +++ b/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