From a0fbc8e612091c3299e193da44e7dde426776dea Mon Sep 17 00:00:00 2001 From: Bill Date: Sat, 1 Apr 2023 21:31:09 -0400 Subject: Commit files after some time mp3s committed - we likely need to sort those out w/ git --- www/diffs/sh-vim.diff | 13 +++++++++++++ www/diffs/sh-vim.html | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 www/diffs/sh-vim.diff create mode 100644 www/diffs/sh-vim.html (limited to 'www/diffs') diff --git a/www/diffs/sh-vim.diff b/www/diffs/sh-vim.diff new file mode 100644 index 0000000..9a53127 --- /dev/null +++ b/www/diffs/sh-vim.diff @@ -0,0 +1,13 @@ +diff --git a/runtime/syntax/sh.vim b/runtime/syntax/sh.vim +index 13d74dbc1..42151f41b 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/www/diffs/sh-vim.html b/www/diffs/sh-vim.html new file mode 100644 index 0000000..d41adf3 --- /dev/null +++ b/www/diffs/sh-vim.html @@ -0,0 +1,44 @@ + + + + + senders - diffs + + +
+

There is an outstanding issue in Vim's shell syntax file. A patch + was made that broke syntax that used almost any changes. I originally made + my own patch that worked for the most part, but in heavily neasted commands + it broke down. In the mailing list the following change was proposed. I am + supplying this diff for my own sanity so when my syntax file gets reset and + is still broken I can apply the diff :)

+
+
+ Download: sh-vim.diff +
+ 
+diff --git a/runtime/syntax/sh.vim b/runtime/syntax/sh.vim
+index 13d74dbc1..42151f41b 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\+"
+
+
+ Vim Dev Mailing List Thread - + Archive (Google Groups) +
+ + -- cgit v1.2.3-54-g00ecf