From f388695793af5eb2c8356a4686fe9ce03c5e0c40 Mon Sep 17 00:00:00 2001
From: Stefan Liebl <Stefan.Liebl@partner.bmw.de>
Date: Tue, 24 Jun 2014 10:39:28 +0200
Subject: [PATCH] move vimfiles.stefan/... to vimfiles.stefan/after

Change-Id: I0469122bf65ddf24129151b2a82619011a6a4879
---
 vimfiles.stefan/{ => after}/ftdetect/a2l.vim      |  0
 vimfiles.stefan/{ => after}/ftdetect/c.vim        |  0
 vimfiles.stefan/{ => after}/ftdetect/paf.vim      |  0
 vimfiles.stefan/{ => after}/ftdetect/scons.vim    |  0
 vimfiles.stefan/{ => after}/ftdetect/srec.vim     |  0
 vimfiles.stefan/{ => after}/ftdetect/tex.vim      |  0
 vimfiles.stefan/{ => after}/ftdetect/trace.vim    |  0
 vimfiles.stefan/{ => after}/ftdetect/uc.vim       |  0
 vimfiles.stefan/{ => after}/ftplugin/a2l.vim      |  0
 vimfiles.stefan/{ => after}/ftplugin/c.vim        |  2 +-
 vimfiles.stefan/{ => after}/ftplugin/dosbatch.vim |  0
 vimfiles.stefan/{ => after}/ftplugin/hex.vim      |  0
 vimfiles.stefan/{ => after}/ftplugin/html.vim     |  0
 vimfiles.stefan/{ => after}/ftplugin/java.vim     |  0
 vimfiles.stefan/{ => after}/ftplugin/make.vim     |  0
 vimfiles.stefan/{ => after}/ftplugin/paf.vim      |  0
 vimfiles.stefan/{ => after}/ftplugin/pascal.vim   |  0
 vimfiles.stefan/{ => after}/ftplugin/python.vim   |  0
 vimfiles.stefan/{ => after}/ftplugin/sh.vim       |  0
 vimfiles.stefan/{ => after}/ftplugin/tex.vim      |  0
 vimfiles.stefan/{ => after}/ftplugin/trace.vim    |  0
 vimfiles.stefan/{ => after}/ftplugin/uc.vim       |  0
 vimfiles.stefan/{ => after}/ftplugin/vim.vim      |  0
 vimfiles.stefan/{ => after}/ftplugin/xml.vim      |  0
 vimfiles.stefan/{ => after}/indent/a2l.vim        |  0
 vimfiles.stefan/{ => after}/syntax/a2l.vim        |  0
 vimfiles.stefan/{ => after}/syntax/c.vim          |  0
 vimfiles.stefan/{ => after}/syntax/java.vim       |  0
 vimfiles.stefan/{ => after}/syntax/paf.vim        |  0
 vimfiles.stefan/{ => after}/syntax/trace.vim      |  0
 vimfiles.stefan/{ => after}/syntax/uc.vim         |  0
 vimfiles.stefan/tools/gvimmerge.base.bat          | 11 +++++++++++
 vimfiles.stefan/tools/gvimmerge.mine.bat          | 11 +++++++++++
 vimfiles.stefan/tools/gvimmerge.theirs.bat        | 11 +++++++++++
 34 files changed, 34 insertions(+), 1 deletion(-)
 rename vimfiles.stefan/{ => after}/ftdetect/a2l.vim (100%)
 rename vimfiles.stefan/{ => after}/ftdetect/c.vim (100%)
 rename vimfiles.stefan/{ => after}/ftdetect/paf.vim (100%)
 rename vimfiles.stefan/{ => after}/ftdetect/scons.vim (100%)
 rename vimfiles.stefan/{ => after}/ftdetect/srec.vim (100%)
 rename vimfiles.stefan/{ => after}/ftdetect/tex.vim (100%)
 rename vimfiles.stefan/{ => after}/ftdetect/trace.vim (100%)
 rename vimfiles.stefan/{ => after}/ftdetect/uc.vim (100%)
 rename vimfiles.stefan/{ => after}/ftplugin/a2l.vim (100%)
 rename vimfiles.stefan/{ => after}/ftplugin/c.vim (97%)
 rename vimfiles.stefan/{ => after}/ftplugin/dosbatch.vim (100%)
 rename vimfiles.stefan/{ => after}/ftplugin/hex.vim (100%)
 rename vimfiles.stefan/{ => after}/ftplugin/html.vim (100%)
 rename vimfiles.stefan/{ => after}/ftplugin/java.vim (100%)
 rename vimfiles.stefan/{ => after}/ftplugin/make.vim (100%)
 rename vimfiles.stefan/{ => after}/ftplugin/paf.vim (100%)
 rename vimfiles.stefan/{ => after}/ftplugin/pascal.vim (100%)
 rename vimfiles.stefan/{ => after}/ftplugin/python.vim (100%)
 rename vimfiles.stefan/{ => after}/ftplugin/sh.vim (100%)
 rename vimfiles.stefan/{ => after}/ftplugin/tex.vim (100%)
 rename vimfiles.stefan/{ => after}/ftplugin/trace.vim (100%)
 rename vimfiles.stefan/{ => after}/ftplugin/uc.vim (100%)
 rename vimfiles.stefan/{ => after}/ftplugin/vim.vim (100%)
 rename vimfiles.stefan/{ => after}/ftplugin/xml.vim (100%)
 rename vimfiles.stefan/{ => after}/indent/a2l.vim (100%)
 rename vimfiles.stefan/{ => after}/syntax/a2l.vim (100%)
 rename vimfiles.stefan/{ => after}/syntax/c.vim (100%)
 rename vimfiles.stefan/{ => after}/syntax/java.vim (100%)
 rename vimfiles.stefan/{ => after}/syntax/paf.vim (100%)
 rename vimfiles.stefan/{ => after}/syntax/trace.vim (100%)
 rename vimfiles.stefan/{ => after}/syntax/uc.vim (100%)
 create mode 100644 vimfiles.stefan/tools/gvimmerge.base.bat
 create mode 100644 vimfiles.stefan/tools/gvimmerge.mine.bat
 create mode 100644 vimfiles.stefan/tools/gvimmerge.theirs.bat

diff --git a/vimfiles.stefan/ftdetect/a2l.vim b/vimfiles.stefan/after/ftdetect/a2l.vim
similarity index 100%
rename from vimfiles.stefan/ftdetect/a2l.vim
rename to vimfiles.stefan/after/ftdetect/a2l.vim
diff --git a/vimfiles.stefan/ftdetect/c.vim b/vimfiles.stefan/after/ftdetect/c.vim
similarity index 100%
rename from vimfiles.stefan/ftdetect/c.vim
rename to vimfiles.stefan/after/ftdetect/c.vim
diff --git a/vimfiles.stefan/ftdetect/paf.vim b/vimfiles.stefan/after/ftdetect/paf.vim
similarity index 100%
rename from vimfiles.stefan/ftdetect/paf.vim
rename to vimfiles.stefan/after/ftdetect/paf.vim
diff --git a/vimfiles.stefan/ftdetect/scons.vim b/vimfiles.stefan/after/ftdetect/scons.vim
similarity index 100%
rename from vimfiles.stefan/ftdetect/scons.vim
rename to vimfiles.stefan/after/ftdetect/scons.vim
diff --git a/vimfiles.stefan/ftdetect/srec.vim b/vimfiles.stefan/after/ftdetect/srec.vim
similarity index 100%
rename from vimfiles.stefan/ftdetect/srec.vim
rename to vimfiles.stefan/after/ftdetect/srec.vim
diff --git a/vimfiles.stefan/ftdetect/tex.vim b/vimfiles.stefan/after/ftdetect/tex.vim
similarity index 100%
rename from vimfiles.stefan/ftdetect/tex.vim
rename to vimfiles.stefan/after/ftdetect/tex.vim
diff --git a/vimfiles.stefan/ftdetect/trace.vim b/vimfiles.stefan/after/ftdetect/trace.vim
similarity index 100%
rename from vimfiles.stefan/ftdetect/trace.vim
rename to vimfiles.stefan/after/ftdetect/trace.vim
diff --git a/vimfiles.stefan/ftdetect/uc.vim b/vimfiles.stefan/after/ftdetect/uc.vim
similarity index 100%
rename from vimfiles.stefan/ftdetect/uc.vim
rename to vimfiles.stefan/after/ftdetect/uc.vim
diff --git a/vimfiles.stefan/ftplugin/a2l.vim b/vimfiles.stefan/after/ftplugin/a2l.vim
similarity index 100%
rename from vimfiles.stefan/ftplugin/a2l.vim
rename to vimfiles.stefan/after/ftplugin/a2l.vim
diff --git a/vimfiles.stefan/ftplugin/c.vim b/vimfiles.stefan/after/ftplugin/c.vim
similarity index 97%
rename from vimfiles.stefan/ftplugin/c.vim
rename to vimfiles.stefan/after/ftplugin/c.vim
index 6aaa4e8..7534fa7 100644
--- a/vimfiles.stefan/ftplugin/c.vim
+++ b/vimfiles.stefan/after/ftplugin/c.vim
@@ -50,7 +50,7 @@ setlocal spell
 let b:GrepFiles = '*.c *.h'
 
 " matchit.vim
-let b:match_words = '\<lint\s\+-save\>:\<lint\s\+-restore\>'
+let b:match_words = b:match_words . ',\<lint\s\+-save\>:\<lint\s\+-restore\>'
 
 " Adding spaces where needed
 " --------------------------
diff --git a/vimfiles.stefan/ftplugin/dosbatch.vim b/vimfiles.stefan/after/ftplugin/dosbatch.vim
similarity index 100%
rename from vimfiles.stefan/ftplugin/dosbatch.vim
rename to vimfiles.stefan/after/ftplugin/dosbatch.vim
diff --git a/vimfiles.stefan/ftplugin/hex.vim b/vimfiles.stefan/after/ftplugin/hex.vim
similarity index 100%
rename from vimfiles.stefan/ftplugin/hex.vim
rename to vimfiles.stefan/after/ftplugin/hex.vim
diff --git a/vimfiles.stefan/ftplugin/html.vim b/vimfiles.stefan/after/ftplugin/html.vim
similarity index 100%
rename from vimfiles.stefan/ftplugin/html.vim
rename to vimfiles.stefan/after/ftplugin/html.vim
diff --git a/vimfiles.stefan/ftplugin/java.vim b/vimfiles.stefan/after/ftplugin/java.vim
similarity index 100%
rename from vimfiles.stefan/ftplugin/java.vim
rename to vimfiles.stefan/after/ftplugin/java.vim
diff --git a/vimfiles.stefan/ftplugin/make.vim b/vimfiles.stefan/after/ftplugin/make.vim
similarity index 100%
rename from vimfiles.stefan/ftplugin/make.vim
rename to vimfiles.stefan/after/ftplugin/make.vim
diff --git a/vimfiles.stefan/ftplugin/paf.vim b/vimfiles.stefan/after/ftplugin/paf.vim
similarity index 100%
rename from vimfiles.stefan/ftplugin/paf.vim
rename to vimfiles.stefan/after/ftplugin/paf.vim
diff --git a/vimfiles.stefan/ftplugin/pascal.vim b/vimfiles.stefan/after/ftplugin/pascal.vim
similarity index 100%
rename from vimfiles.stefan/ftplugin/pascal.vim
rename to vimfiles.stefan/after/ftplugin/pascal.vim
diff --git a/vimfiles.stefan/ftplugin/python.vim b/vimfiles.stefan/after/ftplugin/python.vim
similarity index 100%
rename from vimfiles.stefan/ftplugin/python.vim
rename to vimfiles.stefan/after/ftplugin/python.vim
diff --git a/vimfiles.stefan/ftplugin/sh.vim b/vimfiles.stefan/after/ftplugin/sh.vim
similarity index 100%
rename from vimfiles.stefan/ftplugin/sh.vim
rename to vimfiles.stefan/after/ftplugin/sh.vim
diff --git a/vimfiles.stefan/ftplugin/tex.vim b/vimfiles.stefan/after/ftplugin/tex.vim
similarity index 100%
rename from vimfiles.stefan/ftplugin/tex.vim
rename to vimfiles.stefan/after/ftplugin/tex.vim
diff --git a/vimfiles.stefan/ftplugin/trace.vim b/vimfiles.stefan/after/ftplugin/trace.vim
similarity index 100%
rename from vimfiles.stefan/ftplugin/trace.vim
rename to vimfiles.stefan/after/ftplugin/trace.vim
diff --git a/vimfiles.stefan/ftplugin/uc.vim b/vimfiles.stefan/after/ftplugin/uc.vim
similarity index 100%
rename from vimfiles.stefan/ftplugin/uc.vim
rename to vimfiles.stefan/after/ftplugin/uc.vim
diff --git a/vimfiles.stefan/ftplugin/vim.vim b/vimfiles.stefan/after/ftplugin/vim.vim
similarity index 100%
rename from vimfiles.stefan/ftplugin/vim.vim
rename to vimfiles.stefan/after/ftplugin/vim.vim
diff --git a/vimfiles.stefan/ftplugin/xml.vim b/vimfiles.stefan/after/ftplugin/xml.vim
similarity index 100%
rename from vimfiles.stefan/ftplugin/xml.vim
rename to vimfiles.stefan/after/ftplugin/xml.vim
diff --git a/vimfiles.stefan/indent/a2l.vim b/vimfiles.stefan/after/indent/a2l.vim
similarity index 100%
rename from vimfiles.stefan/indent/a2l.vim
rename to vimfiles.stefan/after/indent/a2l.vim
diff --git a/vimfiles.stefan/syntax/a2l.vim b/vimfiles.stefan/after/syntax/a2l.vim
similarity index 100%
rename from vimfiles.stefan/syntax/a2l.vim
rename to vimfiles.stefan/after/syntax/a2l.vim
diff --git a/vimfiles.stefan/syntax/c.vim b/vimfiles.stefan/after/syntax/c.vim
similarity index 100%
rename from vimfiles.stefan/syntax/c.vim
rename to vimfiles.stefan/after/syntax/c.vim
diff --git a/vimfiles.stefan/syntax/java.vim b/vimfiles.stefan/after/syntax/java.vim
similarity index 100%
rename from vimfiles.stefan/syntax/java.vim
rename to vimfiles.stefan/after/syntax/java.vim
diff --git a/vimfiles.stefan/syntax/paf.vim b/vimfiles.stefan/after/syntax/paf.vim
similarity index 100%
rename from vimfiles.stefan/syntax/paf.vim
rename to vimfiles.stefan/after/syntax/paf.vim
diff --git a/vimfiles.stefan/syntax/trace.vim b/vimfiles.stefan/after/syntax/trace.vim
similarity index 100%
rename from vimfiles.stefan/syntax/trace.vim
rename to vimfiles.stefan/after/syntax/trace.vim
diff --git a/vimfiles.stefan/syntax/uc.vim b/vimfiles.stefan/after/syntax/uc.vim
similarity index 100%
rename from vimfiles.stefan/syntax/uc.vim
rename to vimfiles.stefan/after/syntax/uc.vim
diff --git a/vimfiles.stefan/tools/gvimmerge.base.bat b/vimfiles.stefan/tools/gvimmerge.base.bat
new file mode 100644
index 0000000..03c635f
--- /dev/null
+++ b/vimfiles.stefan/tools/gvimmerge.base.bat
@@ -0,0 +1,11 @@
+%echo off
+set vim=%~dp0..\..\..\vim74\gvim.exe
+set base=%1
+set mine=%2
+set theirs=%3
+set merged=%4
+
+if not exist %vim% (
+  echo gvim.exe nicht gefunden
+)
+echo %vim% %base% %mine% %theirs% %merged%
diff --git a/vimfiles.stefan/tools/gvimmerge.mine.bat b/vimfiles.stefan/tools/gvimmerge.mine.bat
new file mode 100644
index 0000000..03c635f
--- /dev/null
+++ b/vimfiles.stefan/tools/gvimmerge.mine.bat
@@ -0,0 +1,11 @@
+%echo off
+set vim=%~dp0..\..\..\vim74\gvim.exe
+set base=%1
+set mine=%2
+set theirs=%3
+set merged=%4
+
+if not exist %vim% (
+  echo gvim.exe nicht gefunden
+)
+echo %vim% %base% %mine% %theirs% %merged%
diff --git a/vimfiles.stefan/tools/gvimmerge.theirs.bat b/vimfiles.stefan/tools/gvimmerge.theirs.bat
new file mode 100644
index 0000000..03c635f
--- /dev/null
+++ b/vimfiles.stefan/tools/gvimmerge.theirs.bat
@@ -0,0 +1,11 @@
+%echo off
+set vim=%~dp0..\..\..\vim74\gvim.exe
+set base=%1
+set mine=%2
+set theirs=%3
+set merged=%4
+
+if not exist %vim% (
+  echo gvim.exe nicht gefunden
+)
+echo %vim% %base% %mine% %theirs% %merged%