Sync from SUSE:SLFO:Main vim revision 6d9867c33aeba25b5d0c36d49e971cd1

This commit is contained in:
2025-03-20 19:21:11 +01:00
parent 4d05f389b8
commit 9f1cd3ddad
5 changed files with 162 additions and 7 deletions

BIN
vim-9.1.1101.tar.gz (Stored with Git LFS)

Binary file not shown.

View File

@@ -0,0 +1,71 @@
From b16c218964d2024a5c52f251a49c9d71da63f9a0 Mon Sep 17 00:00:00 2001
From: Martin Jungblut Schreiner <martinjungblut@gmail.com>
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

BIN
vim-9.1.1176.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -1,3 +1,85 @@
-------------------------------------------------------------------
Sun Mar 9 23:04:07 UTC 2025 - Martin Schreiner <martin.schreiner@suse.com>
- Introduce patch to fix bsc#1235751 (regression).
* vim-9.1.1134-revert-putty-terminal-colors.patch
- Update to 9.1.1176. Changes:
* 9.1.1176: wrong indent when expanding multiple lines
* 9.1.1175: inconsistent behaviour with exclusive selection and motion commands
* 9.1.1174: tests: Test_complete_cmdline() may fail
* 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
* 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
* 9.1.1166: command-line auto-completion hard with wildmenu
* 9.1.1165: diff: regression with multi-file diff blocks
* 9.1.1164: [security]: code execution with tar.vim and special crafted tar files
* 9.1.1163: $MYVIMDIR is set too late
* 9.1.1162: completion popup not cleared in cmdline
* 9.1.1161: preinsert requires bot "menu" and "menuone" to be set
* 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!
* 9.1.1157: command completion wrong for input()
* 9.1.1156: tests: No test for what patch 9.1.1152 fixes
* 9.1.1155: Mode message not cleared after :silent message
* 9.1.1154: Vim9: not able to use autoload class accross scripts
* 9.1.1153: build error on Haiku
* 9.1.1152: Patch v9.1.1151 causes problems
* 9.1.1151: too many strlen() calls in getchar.c
* 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
* 9.1.1147: preview-window does not scroll correctly
* 9.1.1146: Vim9: wrong context being used when evaluating class member
* 9.1.1145: multi-line completion has wrong indentation for last line
* 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
* 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()
* 9.1.1136: Match highlighting marks a buffer region as changed
* 9.1.1135: 'suffixesadd' doesn't work with multiple items
* 9.1.1134: filetype: Guile init file not recognized
* 9.1.1133: filetype: xkb files not recognized everywhere
* 9.1.1132: Mark positions wrong after triggering multiline completion
* 9.1.1131: potential out-of-memory issue in search.c
* 9.1.1130: 'listchars' "precedes" is not drawn on Tabs.
* 9.1.1129: missing out-of-memory test in buf_write()
* 9.1.1128: patch 9.1.1119 caused a regression with imports
* 9.1.1127: preinsert text is not cleaned up correctly
* 9.1.1126: patch 9.1.1121 used a wrong way to handle enter
* 9.1.1125: cannot loop through pum menu with multiline items
* 9.1.1124: No test for 'listchars' "precedes" with double-width char
* 9.1.1123: popup hi groups not falling back to defaults
* 9.1.1122: too many strlen() calls in findfile.c
* 9.1.1121: Enter does not insert newline with "noselect"
* 9.1.1120: tests: Test_registers fails
* 9.1.1119: Vim9: Not able to use an autoloaded class from another autoloaded script
* 9.1.1118: tests: test_termcodes fails
* 9.1.1117: there are a few minor style issues
* 9.1.1116: Vim9: super not supported in lambda expressions
* 9.1.1115: [security]: use-after-free in str_to_reg()
* 9.1.1114: enabling termguicolors automatically confuses users
* 9.1.1113: tests: Test_terminal_builtin_without_gui waits 2 seconds
* 9.1.1112: Inconsistencies in get_next_or_prev_match()
* 9.1.1111: Vim9: variable not found in transitive import
* 9.1.1110: Vim tests are slow and flaky
* 9.1.1109: cmdexpand.c hard to read
* 9.1.1108: 'smoothscroll' gets stuck with 'listchars' "eol"
* 9.1.1107: cannot loop through completion menu with fuzzy
* 9.1.1106: tests: Test_log_nonexistent() causes asan failure
* 9.1.1105: Vim9: no support for protected new() method
* 9.1.1104: CI: using Ubuntu 22.04 Github runners
* 9.1.1103: if_perl: still some compile errors with Perl 5.38
* 9.1.1102: tests: Test_WinScrolled_Resized_eiw() uses wrong filename
-------------------------------------------------------------------
Wed Feb 19 17:49:16 UTC 2025 - Martin Schreiner <martin.schreiner@suse.com>

View File

@@ -17,7 +17,7 @@
%define pkg_version 9.1
%define patchlevel 1101
%define patchlevel 1176
%define patchlevel_compact %{patchlevel}
%define VIM_SUBDIR vim91
%define site_runtimepath %{_datadir}/vim/site
@@ -71,9 +71,10 @@ Patch15: %{name}-7.4-filetype_apparmor.patch
Patch18: %{name}-7.3-filetype_spec.patch
Patch21: %{name}-7.3-filetype_changes.patch
Patch22: %{name}-7.4-filetype_mine.patch
Patch100: vim73-no-static-libpython.patch
Patch101: vim-8.0.1568-defaults.patch
Patch104: vim-8.2.2411-globalvimrc.patch
Patch100: %{name}73-no-static-libpython.patch
Patch101: %{name}-8.0.1568-defaults.patch
Patch104: %{name}-8.2.2411-globalvimrc.patch
Patch105: %{name}-9.1.1134-revert-putty-terminal-colors.patch
BuildRequires: autoconf
BuildRequires: db-devel
BuildRequires: fdupes
@@ -222,6 +223,7 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim
%patch -P 100 -p1
%patch -P 101 -p1
%patch -P 104 -p1
%patch -P 105 -p1
cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} .
%build