From 7ff806da496619f9109b2075c3ff5b803506d258 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Wed, 26 Feb 2025 17:49:56 +0100 Subject: [PATCH 1/4] ; Fix my last commit --- lisp/progmodes/elisp-mode.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el index bde6b030335..79e32b5f43b 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. @@ -1330,8 +1330,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. From fa42626a6a8d60c9ab313f39b64c12be32054442 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Wed, 26 Feb 2025 18:31:48 +0100 Subject: [PATCH 2/4] ; Fix indentation in cl.texi example --- doc/misc/cl.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi index c210b711a98..91ebf2b3862 100644 --- a/doc/misc/cl.texi +++ b/doc/misc/cl.texi @@ -640,7 +640,7 @@ For example: @example (cl-defmacro dolist ((var listform &optional resultform) - &rest body) + &rest body) @dots{}) @end example From 840c6824589c9a82deedc5112891d8014d134746 Mon Sep 17 00:00:00 2001 From: Eshel Yaron Date: Thu, 27 Feb 2025 15:34:24 +0100 Subject: [PATCH 3/4] ; (completion-preview-complete): Fix bug#76606 * lisp/completion-preview.el (completion-preview-complete): Dismiss completion preview before calling ':exit-function'. This eliminates potential flicker with slow exit functions and avoids the broken preview update reported in bug#76606. --- lisp/completion-preview.el | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lisp/completion-preview.el b/lisp/completion-preview.el index 4928d9a8824..505cf45f48d 100644 --- a/lisp/completion-preview.el +++ b/lisp/completion-preview.el @@ -520,6 +520,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) From 62b3d3136fae8830d63f69143b09e99b5173c537 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 27 Feb 2025 10:57:19 -0800 Subject: [PATCH 4/4] Fix fns-tests-collate-strings failure with musl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * test/src/fns-tests.el (fns-tests-collate-strings): Don’t assume "en_XY.UTF-8", or any particular string, is an invalid locale, as they all seem to be valid in musl. Instead, simply test that a non-string is invalid. (Bug#76550) --- test/src/fns-tests.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/src/fns-tests.el b/test/src/fns-tests.el index 9e134c24e05..2ca67f14539 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