diff --git a/vim-sh-syntax.patch b/vim-sh-syntax.patch new file mode 100644 index 0000000..9cd3373 --- /dev/null +++ b/vim-sh-syntax.patch @@ -0,0 +1,13 @@ +diff --git a/runtime/syntax/sh.vim b/runtime/syntax/sh.vim +index 13d74db..4f7fafb 100644 +--- a/runtime/syntax/sh.vim ++++ b/runtime/syntax/sh.vim +@@ -335,7 +335,7 @@ syn match shEscape contained '\%(^\)\@!\%(\\\\\)*\\.' nextgroup=shComment + " systems too, however, so the following syntax will flag $(..) as + " an Error under /bin/sh. By consensus of vimdev'ers! + if exists("b:is_kornshell") || exists("b:is_bash") || exists("b:is_posix") +- syn region shCommandSub matchgroup=shCmdSubRegion start="\$(\ze[^(]\|$" skip='\\\\\|\\.' end=")" contains=@shCommandSubList ++ syn region shCommandSub matchgroup=shCmdSubRegion start="\$(\ze[^(]" skip='\\\\\|\\.' end=")" contains=@shCommandSubList + syn region shArithmetic matchgroup=shArithRegion start="\$((" skip='\\\\\|\\.' end="))" contains=@shArithList + syn region shArithmetic matchgroup=shArithRegion start="\$\[" skip='\\\\\|\\.' end="\]" contains=@shArithList + syn match shSkipInitWS contained "^\s\+" diff --git a/vim.spec b/vim.spec index a876dcc..8145605 100644 --- a/vim.spec +++ b/vim.spec @@ -50,7 +50,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 @@ -90,6 +90,8 @@ Patch3003: vim-python3-tests.patch Patch3004: vim-crypto-warning.patch # don't ever set mouse (Fedora downstream patch) Patch3005: vim-8.0-copy-paste.patch +# 2169641 - Syntax highlight for sh files broken +Patch3006: vim-sh-syntax.patch # uses autoconf in spec file @@ -386,6 +388,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3003 -p1 -b .python-tests %patch3004 -p1 -b .fips-warning %patch3005 -p1 -b .copypaste +%patch3006 -p1 -b .sh-syntax %build cd src @@ -1003,6 +1006,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Tue Feb 14 2023 Zdenek Dohnal - 2:9.0.1293-2 +- 2169641 - Syntax highlight for sh files broken + * Thu Feb 09 2023 Zdenek Dohnal - 2:9.0.1293-1 - patchlevel 1293