From 2ee4ce0639d9c41f3c06eb03b46061d954e8ea28 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sun, 4 Nov 2018 22:59:39 +0100
Subject: doc: merge sponsor.txt into intro.txt

Also mention how to donate to Nvim.

closes #8603
---
 scripts/vim-patch.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'scripts/vim-patch.sh')

diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh
index de0d040b47..725863102a 100755
--- a/scripts/vim-patch.sh
+++ b/scripts/vim-patch.sh
@@ -149,8 +149,8 @@ preprocess_patch() {
   local na_src='proto\|Make*\|gui_*\|if_lua\|if_mzsch\|if_olepp\|if_ole\|if_perl\|if_py\|if_ruby\|if_tcl\|if_xcmdsrv'
   2>/dev/null $nvim --cmd 'set dir=/tmp' +'g@^diff --git a/src/\S*\<\%(testdir/\)\@<!\%('${na_src}'\)@norm! d/\v(^diff)|%$
' +w +q "$file"
 
-  # Remove channel.txt, netbeans.txt, os_*.txt, term.txt, todo.txt, version*.txt, tags
-  local na_doc='channel\.txt\|netbeans\.txt\|os_\w\+\.txt\|term\.txt\|todo\.txt\|version\d\.txt\|tags'
+  # Remove unwanted Vim doc files.
+  local na_doc='channel\.txt\|netbeans\.txt\|os_\w\+\.txt\|term\.txt\|todo\.txt\|version\d\.txt\|sponsor\.txt\|intro\.txt\|tags'
   2>/dev/null $nvim --cmd 'set dir=/tmp' +'g@^diff --git a/runtime/doc/\<\%('${na_doc}'\)\>@norm! d/\v(^diff)|%$
' +w +q "$file"
 
   # Remove "Last change ..." changes in doc files.
-- 
cgit 


From 89621464fce8bbdca3ca767e9a00c3b82de68180 Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <janedmundlazo@hotmail.com>
Date: Sat, 13 Oct 2018 12:41:44 -0400
Subject: vim-patch: move test_urls.vim out of runtime/

Rename it to check_urls.vim, similar to check-includes.py.
---
 scripts/vim-patch.sh | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'scripts/vim-patch.sh')

diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh
index 725863102a..bb434316a7 100755
--- a/scripts/vim-patch.sh
+++ b/scripts/vim-patch.sh
@@ -179,6 +179,10 @@ preprocess_patch() {
   # Rename path to matchit plugin.
   LC_ALL=C sed -e 's@\( [ab]/runtime\)/pack/dist/opt/matchit/\(plugin/matchit.vim\)@\1/\2@g' \
     "$file" > "$file".tmp && mv "$file".tmp "$file"
+
+  # Rename test_urls.vim to check_urls.vim
+  LC_ALL=C sed -e 's@\( [ab]\)/runtime/doc/test\(_urls.vim\)@\1/scripts/check\2@g' \
+    "$file" > "$file".tmp && mv "$file".tmp "$file"
 }
 
 get_vimpatch() {
-- 
cgit 


From dec38601c5af8a5b52087926c387cfa71faaaeb1 Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <janedmundlazo@hotmail.com>
Date: Sat, 13 Oct 2018 15:02:57 -0400
Subject: vim-patch: rename path to check_colors.vim

---
 scripts/vim-patch.sh | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'scripts/vim-patch.sh')

diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh
index bb434316a7..c16956b0b9 100755
--- a/scripts/vim-patch.sh
+++ b/scripts/vim-patch.sh
@@ -183,6 +183,10 @@ preprocess_patch() {
   # Rename test_urls.vim to check_urls.vim
   LC_ALL=C sed -e 's@\( [ab]\)/runtime/doc/test\(_urls.vim\)@\1/scripts/check\2@g' \
     "$file" > "$file".tmp && mv "$file".tmp "$file"
+
+  # Rename path to check_colors.vim
+  LC_ALL=C sed -e 's@\( [ab]/runtime\)/colors/\(tools/check_colors.vim\)@\1/\2@g' \
+    "$file" > "$file".tmp && mv "$file".tmp "$file"
 }
 
 get_vimpatch() {
-- 
cgit 


From 59ded3ef29b1fa532bc2afa30c857deffc9c20ef Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <janedmundlazo@hotmail.com>
Date: Sat, 13 Oct 2018 15:05:07 -0400
Subject: vim-patch: add matchit doc

matchit doc is named 'pi_matchit.txt'.
---
 scripts/vim-patch.sh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'scripts/vim-patch.sh')

diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh
index c16956b0b9..11305421e5 100755
--- a/scripts/vim-patch.sh
+++ b/scripts/vim-patch.sh
@@ -179,6 +179,8 @@ preprocess_patch() {
   # Rename path to matchit plugin.
   LC_ALL=C sed -e 's@\( [ab]/runtime\)/pack/dist/opt/matchit/\(plugin/matchit.vim\)@\1/\2@g' \
     "$file" > "$file".tmp && mv "$file".tmp "$file"
+  LC_ALL=C sed -e 's@\( [ab]/runtime\)/pack/dist/opt/matchit/doc/\(matchit.txt\)@\1/doc/pi_\2@g' \
+    "$file" > "$file".tmp && mv "$file".tmp "$file"
 
   # Rename test_urls.vim to check_urls.vim
   LC_ALL=C sed -e 's@\( [ab]\)/runtime/doc/test\(_urls.vim\)@\1/scripts/check\2@g' \
-- 
cgit