Mercurial > vim

changeset 33126:7072c7b2c62e v9.0.1845

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.1845: xxd: Test_xxd_color start failing Commit: https://github.com/vim/vim/commit/e0bfb7d3016ccd6c2186b9cd74cee6538eea9b5e Author: Christian Brabandt <cb@256bit.org> Date: Sat Sep 2 19:12:31 2023 +0200 patch 9.0.1845: xxd: Test_xxd_color start failing Problem: xxd: Test_xxd_color start failing Solution: Revert changes to dump file Signed-off-by: Christian Brabandt <cb@256bit.org>
author Christian Brabandt <cb@256bit.org>
date Sat, 02 Sep 2023 19:15:03 +0200
parents f7a949a449b0
children 95f1fc935927
files src/testdir/dumps/Test_xxd_color_1.dump src/testdir/dumps/Test_xxd_color_1.vim src/version.c
diffstat 3 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/dumps/Test_xxd_color_1.dump
+++ b/src/testdir/dumps/Test_xxd_color_1.dump
@@ -14,3 +14,7 @@
 |0@5|d|0|:| |d+2#e000002&|0|d|1| +0#0000000&|d+2#e000002&|2|d|3| +0#0000000&|d+2#e000002&|4|d|5| +0#0000000&|d+2#e000002&|6|d|7| +0#0000000&|d+2#e000002&|8|d|9| +0#0000000&|d+2#e000002&|a|d|b| +0#0000000&|d+2#e000002&|c|d@1| +0#0000000&|d+2#e000002&|e|d|f| +0#0000000&@1|.+2#e000002&@15| +0#0000000&@7
 |0@5|e|0|:| |e+2#e000002&|0|e|1| +0#0000000&|e+2#e000002&|2|e|3| +0#0000000&|e+2#e000002&|4|e|5| +0#0000000&|e+2#e000002&|6|e|7| +0#0000000&|e+2#e000002&|8|e|9| +0#0000000&|e+2#e000002&|a|e|b| +0#0000000&|e+2#e000002&|c|e|d| +0#0000000&|e+2#e000002&@2|f| +0#0000000&@1|.+2#e000002&@15| +0#0000000&@7
 |0@5|f|0|:| |f+2#e000002&|0|f|1| +0#0000000&|f+2#e000002&|2|f|3| +0#0000000&|f+2#e000002&|4|f|5| +0#0000000&|f+2#e000002&|6|f|7| +0#0000000&|f+2#e000002&|8|f|9| +0#0000000&|f+2#e000002&|a|f|b| +0#0000000&|f+2#e000002&|c|f|d| +0#0000000&|f+2#e000002&|e|f+2#0000e05&@1| +0#0000000&@1|.+2#e000002&@14|.+2#0000e05&| +0#0000000&@7
+|$| > @72
+@75
+@75
+@75
--- a/src/testdir/dumps/Test_xxd_color_1.vim
+++ b/src/testdir/dumps/Test_xxd_color_1.vim
@@ -1,3 +1,3 @@
 " Filter that removes the Shell Prompt from the xxd command
-18,20d
+" 18,20d
 :1s#|\$+0&\#ffffff0| |.@1|/|x@1|d|/|x@1|d|.*\n#|$+0\&\#ffffff0| #e
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1845,
+/**/
     1844,
 /**/
     1843,