Accepting request 1290727 from editors

- update to 9.1.1508 
  * patch 9.1.1508: string manipulation can be improved in cmdexpand.c
  * runtime(vim): Update base-syntax and generator, match all default highlight groups
  * runtime(vim): Update base-syntax and generator, generate command modifiers
  * patch 9.1.1507: symlinks are resolved on :cd commands
  * runtime(postscr): Correct some standard font names in syntax
  * runtime(optwin): show 'guiligatures' option also on MS-Windows builds
  * patch 9.1.1506: tests: missing cleanup in Test_search_cmdline_incsearch_highlight()
  * patch 9.1.1505: not possible to return completion type for :ex command
  * patch 9.1.1504: filetype: numbat files are not recognized
  * patch 9.1.1503: filetype: haxe files are not recognized
  * patch 9.1.1502: filetype: quickbms files are not recognized
  * patch 9.1.1501: filetype: flix files are not recognized
  * runtime(go): add section movement mappings to ftplugin
  * runtime(doc): Tweak documentation style
  * patch 9.1.1500: if_python: typo in python error variable
  * runtime(tutor): regenerate utf-8 version of French vimtutor manpage
  * runtime(netrw): upstream snapshot of v183
  * runtime(vim): Update base-syntax, improve :syn-sync line defaults
  * patch 9.1.1498: completion: 'complete' funcs behave different to 'omnifunc'
  * patch 9.1.1497: Link error with shm_open()
  * patch 9.1.1496: terminal: still not highlighting empty cells correctly
  * README: mention POSIX vi as a goal of this project
  * patch 9.1.1495: Wayland: uses $XDG_SEAT to determine seat
  * patch 9.1.1494: runtime(tutor): no French translation for Chapter 2
  * runtime(tutor): apply fixes to runtime/tutor/tutor2
  * translation(it): updated Italian manpage
  * patch 9.1.1493: manually comparing positions on buffer
  * nsis: copy tutor directory recursively
  * patch 9.1.1492: tests: failure when Wayland compositor fails to start

OBS-URL: https://build.opensuse.org/request/show/1290727
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vim?expand=0&rev=387

apparmor.vim

@@ -166,8 +166,8 @@ syn match sdRLimit /\v^\s*set\s+rlimit\s+(nofile|ofile|nproc|rtprio)\s+\<\=\s+[0
 syn match sdRLimit /\v^\s*set\s+rlimit\s+(locks|sigpending)\s+\<\=\s+[0-9]+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdComment
 syn match sdRLimit /\v^\s*set\s+rlimit\s+(fsize|data|stack|core|rss|as|memlock|msgqueue)\s+\<\=\s+[0-9]+([KMG]B)?\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdComment
 syn match sdRLimit /\v^\s*set\s+rlimit\s+nice\s+\<\=\s+(-1?[0-9]|-20|1?[0-9])\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdComment
-syn match sdRLimit /\v^\s*set\s+rlimit\s+cpu\s+\<\=\s+[0-9]+(seconds|minutes|hours|days)?\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdComment
-syn match sdRLimit /\v^\s*set\s+rlimit\s+rttime\s+\<\=\s+[0-9]+(ms|seconds|minutes)?\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdComment
+syn match sdRLimit /\v^\s*set\s+rlimit\s+cpu\s+\<\=\s+[0-9]+\s*(s|sec|second|seconds|min|minute|minutes|h|hour|hours|d|day|days|week|weeks)?\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdComment
+syn match sdRLimit /\v^\s*set\s+rlimit\s+rttime\s+\<\=\s+[0-9]+\s*(us|microsecond|microseconds|ms|millisecond|milliseconds|s|sec|second|seconds|min|minute|minutes|h|hour|hours|d|day|days|week|weeks)?\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdComment
 syn match sdRLimit /\v^\s*set\s+rlimit\s+(cpu|rttime|nofile|nproc|rtprio|locks|sigpending|fsize|data|stack|core|rss|as|memlock|msgqueue|nice)\s+\<\=\s+infinity\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdComment
 
 " userns

vim-7.3-mktemp_tutor.patch

@@ -1,14 +1,15 @@
-Index: vim-8.2.2411/src/vimtutor
+Index: vim-9.1.0908/src/vimtutor
 ===================================================================
---- vim-8.2.2411.orig/src/vimtutor
-+++ vim-8.2.2411/src/vimtutor
-@@ -24,8 +24,7 @@ xx=$1
- export xx
+--- vim-9.1.0908.orig/src/vimtutor
++++ vim-9.1.0908/src/vimtutor
+@@ -158,9 +158,8 @@ done
+ 
  
  # We need a temp file for the copy.  First try using a standard command.
 -tmp="${TMPDIR-/tmp}"
--TUTORCOPY=`mktemp $tmp/tutorXXXXXX || tempfile -p tutor || echo none`
-+TUTORCOPY=`mktemp /tmp/tutorXXXXXX || echo /tmp/tutor$$`
+ # shellcheck disable=SC2186
+-TUTORCOPY=$(mktemp "$tmp/tutorXXXXXX" || tempfile -p tutor || echo none)
++TUTORCOPY=$(mktemp /tmp/tutorXXXXXX || echo /tmp/tutor$$)
  
  # If the standard commands failed then create a directory to put the copy in.
  # That is a secure way to make a temp file.

vim-7.3-sh_is_bash.patch

@@ -1,9 +1,9 @@
-Index: vim-8.2.2411/runtime/syntax/sh.vim
+Index: vim-9.1.1230/runtime/syntax/sh.vim
 ===================================================================
---- vim-8.2.2411.orig/runtime/syntax/sh.vim
-+++ vim-8.2.2411/runtime/syntax/sh.vim
-@@ -74,6 +74,13 @@ if exists("b:is_dash")
-  let b:is_posix= 1
+--- vim-9.1.1230.orig/runtime/syntax/sh.vim
++++ vim-9.1.1230/runtime/syntax/sh.vim
+@@ -80,6 +80,13 @@ if exists("b:is_kornshell") || exists("b
+  endif
  endif
  
 +" Neither is_kornshell nor is_bash was explicitly set, and

vim-9.1.0718.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:615154446ce5d98fdd4c038fe95911855f045a7d94bef8930d912c0d5f15706f
-size 18088845

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 <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

vim-9.1.1508.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6229dd8856364b0edb6d76e1c6f4a4a61b404d283c2a61833816b47afc9a8b06
+size 18571702

vim.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package vim
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 %define pkg_version 9.1
-%define patchlevel 0718
+%define patchlevel 1508
 %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
@@ -414,6 +416,10 @@ install -D -m 0644 \
     vimrc_example1 vimrc_example2 suse.vimrc \
     README.txt READMEdir/README_src.txt READMEdir/README_unix.txt \
   %{buildroot}%{_docdir}/vim/
+
+rm -f %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/LICENSE
+rm -f %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/README.txt
+
 # gvim
 install -D -m 0644 \
     README.Japanese-XIM runtime/gvimrc_example.vim suse.gvimrc \