From fab8fd3a75e1000fad82f343fba145df539d6196 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Sat, 22 Jun 2024 18:42:06 +0200 Subject: [PATCH] Replace literal whitespace with `\s` * test/lisp/vc/log-edit-tests.el (log-edit-fill-entry-confinement) (log-edit-fill-entry-space-substitution) (log-edit-fill-entry-initial-wrapping): Replace literal space character with '\s', to avoid tripping up merge scripts. (cherry picked from commit 4a76af51bb685e3082b152c35117bab1ed511d40) --- test/lisp/vc/log-edit-tests.el | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/test/lisp/vc/log-edit-tests.el b/test/lisp/vc/log-edit-tests.el index db60d21f137..8dc0f1d8955 100644 --- a/test/lisp/vc/log-edit-tests.el +++ b/test/lisp/vc/log-edit-tests.el @@ -180,9 +180,7 @@ lines.")))) (insert string4) (let ((fill-column 39)) (log-edit-fill-entry)) (should (equal (buffer-string) - ;; There is whitespace after "file2.txt" which - ;; should not be erased! - "* file2.txt + "* file2.txt\s (abcdefghijklmnopqrstuvwxyz):"))))) (ert-deftest log-edit-fill-entry-space-substitution () @@ -228,7 +226,7 @@ division. (sfnt_round_none, sfnt_round_to_grid, sfnt_round_to_double_grid) " wanted " -* src/sfnt.c +* src/sfnt.c\s (xmalloc, xrealloc): Improve behavior upon allocation @@ -330,7 +328,7 @@ new line. (but_this_entry_should_not): With the prose displaced to the next line instead." wanted " -* src/sfnt.c +* src/sfnt.c\s (long_entry_1): This entry should be placed on a new -- 2.39.2