diff --git a/vim-9.1.1134-revert-putty-terminal-colors.patch b/vim-9.1.1134-revert-putty-terminal-colors.patch new file mode 100644 index 0000000..5b6a0ac --- /dev/null +++ b/vim-9.1.1134-revert-putty-terminal-colors.patch @@ -0,0 +1,71 @@ +From b16c218964d2024a5c52f251a49c9d71da63f9a0 Mon Sep 17 00:00:00 2001 +From: Martin Jungblut Schreiner +Date: Wed, 5 Mar 2025 17:07:19 -0300 +Subject: [PATCH] Revert "runtime(defaults): Detect putty terminal and switch + to dark background" + +This reverts commit 2abec431e1ab5f4f6e21c2bb490241732622a8c5. +--- + runtime/defaults.vim | 5 ----- + runtime/doc/autocmd.txt | 17 ++++------------- + runtime/doc/version9.txt | 3 +++ + src/testdir/test_cmdline.vim | 2 -- + 4 files changed, 7 insertions(+), 20 deletions(-) + +Index: vim-9.1.1176/runtime/defaults.vim +=================================================================== +--- vim-9.1.1176.orig/runtime/defaults.vim ++++ vim-9.1.1176/runtime/defaults.vim +@@ -112,11 +112,6 @@ if 1 + \ | execute "normal! g`\"" + \ | endif + +- " Set the default background for putty to dark. Putty usually sets the +- " $TERM to xterm and by default it starts with a dark background which +- " makes syntax highlighting often hard to read with bg=light +- " undo this using: ":au! vimStartup TermResponse" +- autocmd TermResponse * if v:termresponse == "\e[>0;136;0c" | set bg=dark | endif + augroup END + + " Quite a few people accidentally type "q:" instead of ":q" and get confused +Index: vim-9.1.1176/runtime/doc/autocmd.txt +=================================================================== +--- vim-9.1.1176.orig/runtime/doc/autocmd.txt ++++ vim-9.1.1176/runtime/doc/autocmd.txt +@@ -1260,19 +1260,10 @@ TerminalWinOpen Just after a terminal + TermResponse After the response to |t_RV| is received from + the terminal. The value of |v:termresponse| + can be used to do things depending on the +- terminal version. +- This is used in |defaults.vim| to detect +- putty terminal and set a dark background: > +- +- au TermResponse * +- \ if v:termresponse == "\e[>0;136;0c" +- \ set bg=dark +- \ endif +-< +- Note: that this event may be triggered halfway +- executing another event, especially if file +- I/O, a shell command or anything else that +- takes time is involved. ++ terminal version. Note that this event may be ++ triggered halfway executing another event, ++ especially if file I/O, a shell command or ++ anything else that takes time is involved. + *TermResponseAll* + TermResponseAll After the response to |t_RV|, |t_RC|, |t_RS|, + |t_RB|, |t_RF|, or |t_u7| are received from +Index: vim-9.1.1176/src/testdir/test_cmdline.vim +=================================================================== +--- vim-9.1.1176.orig/src/testdir/test_cmdline.vim ++++ vim-9.1.1176/src/testdir/test_cmdline.vim +@@ -1843,8 +1843,6 @@ func Test_verbose_option() + CheckScreendump + + let lines =<< trim [SCRIPT] +- " clear the TermResponse autocommand from defaults.vim +- au! vimStartup TermResponse + command DoSomething echo 'hello' |set ts=4 |let v = '123' |echo v + call feedkeys("\r", 't') " for the hit-enter prompt + set verbose=20 diff --git a/vim-9.1.1134.tar.gz b/vim-9.1.1134.tar.gz deleted file mode 100644 index 1840daf..0000000 --- a/vim-9.1.1134.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8f969ea5b75e85158ff0aad1d0962d1a35a7cc9ea3310e3fa9d95e4e35e29d63 -size 18490421 diff --git a/vim-9.1.1176.tar.gz b/vim-9.1.1176.tar.gz new file mode 100644 index 0000000..1fcdd33 --- /dev/null +++ b/vim-9.1.1176.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:97662b30bbd80b2fe925d158081519c2aceed47a246a3667c1f6c6d0ed5e86fd +size 18513996 diff --git a/vim.changes b/vim.changes index 91808e3..65e53a1 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,86 @@ +------------------------------------------------------------------- +Thu Mar 6 20:26:27 UTC 2025 - Martin Schreiner + +- Introduce patch to fix bsc#1235751 (regression). + * vim-9.1.1134-revert-putty-terminal-colors.patch +- Update to 9.1.1176. + * 9.1.1176: wrong indent when expanding multiple lines + test(runtime/syntax): improve syntax tests + editorconfig: set indent config for *.vim files + runtime(doc): mention alternative check for vim9script + * 9.1.1175: inconsistent behaviour with exclusive selection and motion commands + runtime(man): don't add jumps when loading a manpage + runtime(vim): recognize <...> strings (and keys) for 'keywordprg' + * 9.1.1174: tests: Test_complete_cmdline() may fail + runtime(doc): mention bzip3 in gzip plugin documentation + * 9.1.1173: filetype: ABNF files are not detected + * 9.1.1172: [security]: overflow with 'nostartofline' and Ex command in tag file + * 9.1.1171: tests: wrong arguments passed to assert_equal() + * 9.1.1170: wildmenu highlighting in popup can be improved + runtime(netrw): upstream snapshot of v179 + runtime(doc): fix typo "bet" in :h 'completeopt' + * 9.1.1169: using global variable for get_insert()/get_lambda_name() + * 9.1.1168: wrong flags passed down to nextwild() + * 9.1.1167: mark '] wrong after copying text object + runtime(doc): update how to get Vim + * 9.1.1166: command-line auto-completion hard with wildmenu + runtime(tar): use readblob() instead of shelling out to file(1) + * 9.1.1165: diff: regression with multi-file diff blocks + * 9.1.1164: [security]: code execution with tar.vim and special crafted tar files + translation(it): Update Italian translation + runtime(tar): fix syntax error in tar.vim + * 9.1.1163: $MYVIMDIR is set too late + runtime(syntax-tests): Apply stronger synchronisation between buffers + * 9.1.1162: completion popup not cleared in cmdline + * 9.1.1161: preinsert requires bot "menu" and "menuone" to be set + runtime(misc): add support for bzip3 to tar, vimball and gzip plugins + * 9.1.1160: Ctrl-Y does not work well with "preinsert" when completing items + * 9.1.1159: $MYVIMDIR may not always be set + * 9.1.1158: :verbose set has wrong file name with :compiler! + runtime(netrw): correctly handle shellslash variable + * 9.1.1157: command completion wrong for input() + runtime(doc): fix confusing docs for 'completeitemalign' + * 9.1.1156: tests: No test for what patch 9.1.1152 fixes + * 9.1.1155: Mode message not cleared after :silent message + runtime(lua): Improve 'include' and make '*expr' functions script-local + runtime(vim): Update base-syntax, match Vim9 function calls after "|" + * 9.1.1154: Vim9: not able to use autoload class accross scripts + runtime(compiler): improve svelte-check + * 9.1.1153: build error on Haiku + * 9.1.1152: Patch v9.1.1151 causes problems + runtime(new-tutor): update examples from Neovim to Vim + nsis: add Portuguese Brazilian translation to nsis installer + * 9.1.1151: too many strlen() calls in getchar.c + runtime(vim): make VimKeywordPrg even smarter for regexes + * 9.1.1150: :hi completion may complete to wrong value + * 9.1.1149: Unix Makefile does not support Brazilian lang for the installer + * 9.1.1148: Vim9: finding imported scripts can be further improved + runtime(lua): Update lua ftplugin and documentation + * 9.1.1147: preview-window does not scroll correctly + nsis: added support for pt-BR to installer and update README.txt + translation(tr): Update Turkish translations + * 9.1.1146: Vim9: wrong context being used when evaluating class member + * 9.1.1145: multi-line completion has wrong indentation for last line + runtime(netrw): runtime(netrw): upstream snapshot of v178 + * 9.1.1144: no way to create raw strings from a blob + * 9.1.1143: illegal memory access when putting a register + * 9.1.1142: tests: test_startup fails if $HOME/$XDG_CONFIG_HOME is defined + runtime(vim): improve &keywordprg in ftplugin + runtime(vim): Update base-syntax, match :CompilerSet and :SynMenu commands + * 9.1.1141: Misplaced comment in readfile() + * 9.1.1140: filetype: m17ndb files are not detected + * 9.1.1139: [fifo] is not displayed when editing a fifo + * 9.1.1138: cmdline completion for :hi is too simplistic + * 9.1.1137: ins_str() is inefficient by calling STRLEN() + CI: Install netbeans on windows to make sure to run test_netbeans.vim + runtime(dockerfile): set comments in filetype plugin + runtime(compiler): include svelte-check compiler + runtime(doc): get rid of the titlestring hack for terminal-api + * 9.1.1136: Match highlighting marks a buffer region as changed + * 9.1.1135: 'suffixesadd' doesn't work with multiple items + runtime(filetype): move filetype detection into filetypedetect augroup + CI: add Makefile target to verify default highlighting groups are present + ------------------------------------------------------------------- Fri Feb 21 21:34:10 UTC 2025 - Martin Schreiner diff --git a/vim.spec b/vim.spec index 1635829..e588b9b 100644 --- a/vim.spec +++ b/vim.spec @@ -17,7 +17,7 @@ %define pkg_version 9.1 -%define patchlevel 1134 +%define patchlevel 1176 %define patchlevel_compact %{patchlevel} %define VIM_SUBDIR vim91 %define site_runtimepath %{_datadir}/vim/site @@ -74,6 +74,7 @@ Patch11: %{name}-7.4-filetype_mine.patch Patch12: %{name}73-no-static-libpython.patch Patch13: %{name}-8.0.1568-defaults.patch Patch14: %{name}-8.2.2411-globalvimrc.patch +Patch15: %{name}-9.1.1134-revert-putty-terminal-colors.patch BuildRequires: autoconf BuildRequires: db-devel BuildRequires: fdupes @@ -223,6 +224,7 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim %patch -P 12 -p1 %patch -P 13 -p1 %patch -P 14 -p1 +%patch -P 15 -p1 cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} . %build