Remove sh syntax patch, it is already in upstream
This commit is contained in:
parent
f85584f35b
commit
c922af3f1b
@ -1,13 +0,0 @@
|
|||||||
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\+"
|
|
3
vim.spec
3
vim.spec
@ -90,8 +90,6 @@ Patch3003: vim-python3-tests.patch
|
|||||||
Patch3004: vim-crypto-warning.patch
|
Patch3004: vim-crypto-warning.patch
|
||||||
# don't ever set mouse (Fedora downstream patch)
|
# don't ever set mouse (Fedora downstream patch)
|
||||||
Patch3005: vim-8.0-copy-paste.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
|
# uses autoconf in spec file
|
||||||
@ -388,7 +386,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
|
|||||||
%patch3003 -p1 -b .python-tests
|
%patch3003 -p1 -b .python-tests
|
||||||
%patch3004 -p1 -b .fips-warning
|
%patch3004 -p1 -b .fips-warning
|
||||||
%patch3005 -p1 -b .copypaste
|
%patch3005 -p1 -b .copypaste
|
||||||
%patch3006 -p1 -b .sh-syntax
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
cd src
|
cd src
|
||||||
|
Loading…
Reference in New Issue
Block a user