From f2e01d7e513067ddb57c75f6e38cdcf434946cf8 Mon Sep 17 00:00:00 2001
From: Max Christian Pohle
Date: Mon, 22 Oct 2018 00:02:58 +0200
Subject: Major refactoring for version 2.0

vim-plug has been removed and replaced with Vims internal bundle
mechanism. But I already noticed, that there is also GLVM now and
started trying that as well.
---
 plugin/AlignMapsPlugin.vim                 | 253 +++++++++++++++
 plugin/AlignPlugin.vim                     |  41 +++
 plugin/cecutil.vim                         | 482 +++++++++++++++++++++++++++++
 plugin/cscope.vim                          |  57 ++++
 plugin/jedi.vim                            |  15 +
 plugin/max-change-icon.vim                 |  11 +
 plugin/max-find-bash.vim                   |   9 +
 plugin/max-fix-colorschemes.vim            |  49 +++
 plugin/max-function-menu.vim               | 173 +++++++++++
 plugin/max-highlight-word-under-cursor.vim |  18 ++
 plugin/max-set-window-title.vim            |  21 ++
 plugin/max-splash.vim                      |  23 ++
 plugin/nerdtree.vim                        |  25 ++
 plugin/netrw.vim                           |  16 +
 plugin/signify.vim                         |  35 +++
 plugin/snippets.vim                        |  12 +
 plugin/statusline.vim                      | 125 ++++++++
 plugin/tagbar.vim                          |  10 +
 plugin/terminal.vim                        |  19 ++
 19 files changed, 1394 insertions(+)
 create mode 100644 plugin/AlignMapsPlugin.vim
 create mode 100644 plugin/AlignPlugin.vim
 create mode 100644 plugin/cecutil.vim
 create mode 100644 plugin/cscope.vim
 create mode 100644 plugin/jedi.vim
 create mode 100644 plugin/max-change-icon.vim
 create mode 100644 plugin/max-find-bash.vim
 create mode 100644 plugin/max-fix-colorschemes.vim
 create mode 100644 plugin/max-function-menu.vim
 create mode 100644 plugin/max-highlight-word-under-cursor.vim
 create mode 100644 plugin/max-set-window-title.vim
 create mode 100644 plugin/max-splash.vim
 create mode 100644 plugin/nerdtree.vim
 create mode 100644 plugin/netrw.vim
 create mode 100644 plugin/signify.vim
 create mode 100644 plugin/snippets.vim
 create mode 100644 plugin/statusline.vim
 create mode 100644 plugin/tagbar.vim
 create mode 100644 plugin/terminal.vim

(limited to 'plugin')

diff --git a/plugin/AlignMapsPlugin.vim b/plugin/AlignMapsPlugin.vim
new file mode 100644
index 0000000..7296f7f
--- /dev/null
+++ b/plugin/AlignMapsPlugin.vim
@@ -0,0 +1,253 @@
+" AlignMapsPlugin:   Alignment maps based upon <Align.vim> and <AlignMaps.vim>
+" Maintainer:        Dr. Charles E. Campbell. <NdrOchipS@PcampbellAfamily.Mbiz>
+" Date:              Jan 07, 2013
+"
+" NOTE: the code herein needs vim 7.0 or later
+" Copyright:    Copyright (C) 1999-2012 Charles E. Campbell {{{1
+"               Permission is hereby granted to use and distribute this code,
+"               with or without modifications, provided that this copyright
+"               notice is copied with it. Like anything else that's free,
+"               AlignMaps.vim is provided *as is* and comes with no warranty
+"               of any kind, either expressed or implied. By using this
+"               plugin, you agree that in no event will the copyright
+"               holder be liable for any damages resulting from the use
+"               of this software.
+" Romans 1:20 For the invisible things of Him since the creation of the {{{1
+" world are clearly seen, being perceived through the things that are
+" made, even His everlasting power and divinity; that they may be
+" without excuse.
+
+" ---------------------------------------------------------------------
+" Usage: {{{1
+" Use 'a to mark beginning of to-be-aligned region,   Alternative:  use V
+" move cursor to end of region, and execute map.      (linewise visual mode) to
+" The maps also set up marks 'y and 'z, and retain    mark region, execute same
+" 'a at the beginning of region.                      map.  Uses 'a, 'y, and 'z.
+"
+" The start/end wrappers save and restore marks 'y and 'z.
+"
+" Although the comments indicate the maps use a leading backslash,
+" actually they use <Leader> (:he mapleader), so the user can
+" specify that the maps start how he or she prefers.
+"
+" Note: these maps all use <Align.vim>.
+"
+" Load Once: {{{1
+if &cp || exists("g:loaded_AlignMapsPlugin")
+ finish
+endif
+let s:keepcpo                = &cpo
+let g:loaded_AlignMapsPlugin = "v43"
+set cpo&vim
+
+" =====================================================================
+"  Public Interface: {{{1
+com! AlignMapsClean	:call AlignMaps#AlignMapsClean()
+
+" =====================================================================
+"  Maps: {{{1
+
+" ---------------------------------------------------------------------
+" WS: wrapper start map (internal)  {{{2
+" Produces a blank line above and below, marks with 'y and 'z
+if !hasmapto('<Plug>WrapperStart')
+ map <unique> <SID>WS	<Plug>AlignMapsWrapperStart
+endif
+nnoremap <silent> <script> <Plug>AlignMapsWrapperStart	:set lz<CR>:call AlignMaps#WrapperStart(0)<CR>
+vnoremap <silent> <script> <Plug>AlignMapsWrapperStart	:<c-u>set lz<CR>:call AlignMaps#WrapperStart(1)<CR>
+
+" ---------------------------------------------------------------------
+" WE: wrapper end (internal)   {{{2
+" Removes guard lines, restores marks y and z, and restores search pattern
+if !hasmapto('<Plug>WrapperEnd')
+ nmap <unique> <SID>WE	<Plug>AlignMapsWrapperEnd
+endif
+nnoremap <silent> <script> <Plug>AlignMapsWrapperEnd	:call AlignMaps#WrapperEnd()<CR>:set nolz<CR>
+
+" ---------------------------------------------------------------------
+" Complex C-code alignment maps: {{{2
+if !hasmapto('<Plug>AM_a?')   |call AlignMaps#MakeMap("a?")|endif
+if !hasmapto('<Plug>AM_a,')   |call AlignMaps#MakeMap("a,")|endif
+if !hasmapto('<Plug>AM_a<')   |call AlignMaps#MakeMap("a<")|endif
+if !hasmapto('<Plug>AM_a=')   |call AlignMaps#MakeMap("a=")|endif
+if !hasmapto('<Plug>AM_a(')   |call AlignMaps#MakeMap("a(")|endif
+if !hasmapto('<Plug>AM_abox') |call AlignMaps#MakeMap("abox")|endif
+if !hasmapto('<Plug>AM_acom') |call AlignMaps#MakeMap("acom")|endif
+if !hasmapto('<Plug>AM_adcom')|call AlignMaps#MakeMap("adcom")|endif
+if !hasmapto('<Plug>AM_aocom')|call AlignMaps#MakeMap("aocom")|endif
+if !hasmapto('<Plug>AM_ascom')|call AlignMaps#MakeMap("ascom")|endif
+if !hasmapto('<Plug>AM_adec') |call AlignMaps#MakeMap("adec")|endif
+if !hasmapto('<Plug>AM_adef') |call AlignMaps#MakeMap("adef")|endif
+if !hasmapto('<Plug>AM_afnc') |call AlignMaps#MakeMap("afnc")|endif
+if !hasmapto('<Plug>AM_afnc') |call AlignMaps#MakeMap("afnc")|endif
+
+" ---------------------------------------------------------------------
+" Number alignment maps: {{{2
+if !hasmapto('<Plug>AM_aunum')|call AlignMaps#MakeMap("aunum")|endif
+if !hasmapto('<Plug>AM_aenum')|call AlignMaps#MakeMap("aenum")|endif
+if exists("g:alignmaps_euronumber") && !exists("g:alignmaps_usanumber")
+ if !hasmapto('<Plug>AM_anum')|call AlignMaps#MakeMap("anum")|endif
+else
+ if !hasmapto('<Plug>AM_anum')|call AlignMaps#MakeMap("anum")|endif
+endif
+
+" ---------------------------------------------------------------------
+" Plug maps: (the real thing) {{{2
+nnoremap <silent> <script> <Plug>AM_a?		<SID>WS:AlignCtrl mIp1P1lC ? : : : : <CR>:'a,.Align<CR>:'a,'z-1s/\(\s\+\)? /?\1/e<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_a,		<SID>WS:'y,'zs/\(\S\)\s\+/\1 /ge<CR>'yjma'zk:call AlignMaps#CharJoiner(",")<cr>:silent 'y,'zg/,/call AlignMaps#FixMultiDec()<CR>'z:exe "norm \<Plug>AM_adec"<cr><SID>WE
+nnoremap <silent> <script> <Plug>AM_a<		<SID>WS:AlignCtrl mIp1P1=l << >><CR>:'a,.Align<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_a(      <SID>WS:AlignCtrl mIp0P1=l<CR>:'a,.Align [(,]<CR>:sil 'y+1,'z-1s/\(\s\+\),/,\1/ge<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_a=		<SID>WS:AlignCtrl mIp1P1=l<CR>:AlignCtrl g :=<CR>:'a,'zAlign :\==<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_abox	<SID>WS:let g:alignmaps_iws=substitute(getline("'a"),'^\(\s*\).*$','\1','e')<CR>:'a,'z-1s/^\s\+//e<CR>:'a,'z-1s/^.*$/@&@/<CR>:AlignCtrl m=p01P0w @<CR>:'a,.Align<CR>:'a,'z-1s/@/ * /<CR>:'a,'z-1s/@$/*/<CR>'aYP:s/./*/g<CR>0r/'zkYp:s/./*/g<CR>0r A/<Esc>:exe "'a-1,'z-1s/^/".g:alignmaps_iws."/e"<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_acom	<SID>WS:'a,.s/\/[*/]\/\=/@&@/e<CR>:'a,.s/\*\//@&/e<CR>:'y,'zs/^\( *\) @/\1@/e<CR>'zk:call AlignMaps#StdAlign(2)<CR>:'y,'zs/^\(\s*\) @/\1/e<CR>:'y,'zs/ @//eg<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_adcom	<SID>WS:'a,.v/^\s*\/[/*]/s/\/[*/]\*\=/@&@/e<CR>:'a,.v/^\s*\/[/*]/s/\*\//@&/e<CR>:'y,'zv/^\s*\/[/*]/s/^\( *\) @/\1@/e<CR>'zk:call AlignMaps#StdAlign(3)<cr>:'y,'zv/^\s*\/[/*]/s/^\(\s*\) @/\1/e<CR>:'y,'zs/ @//eg<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_aocom	<SID>WS:AlignPush<CR>:AlignCtrl g /[*/]<CR>:exe "norm \<Plug>AM_acom"<cr>:AlignPop<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_ascom	<SID>WS:'a,.s/\/[*/]/@&@/e<CR>:'a,.s/\*\//@&/e<CR>:silent! 'a,.g/^\s*@\/[*/]/s/@//ge<CR>:AlignCtrl v ^\s*\/[*/]<CR>:AlignCtrl g \/[*/]<CR>'zk:call AlignMaps#StdAlign(2)<cr>:'y,'zs/^\(\s*\) @/\1/e<CR>:'y,'zs/ @//eg<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_adec	<SID>WS:'a,'zs/\([^ \t/(]\)\([*&]\)/\1 \2/e<CR>:'y,'zv/^\//s/\([^ \t]\)\s\+/\1 /ge<CR>:'y,'zv/^\s*[*/]/s/\([^/][*&]\)\s\+/\1/ge<CR>:'y,'zv/^\s*[*/]/s/^\(\s*\%([a-zA-Z_][a-zA-Z_0-9<>:]*\s\+\%([a-zA-Z_*(&]\)\@=\)\+\)\([*(&]*\)\s*\([a-zA-Z0-9_()<>:]\+\)\s*\(\(\[.\{-}]\)*\)\s*\(=\)\=\s*\(.\{-}\)\=\s*;/\1@\2#@\3\4@\6@\7;@/e<CR>:'y,'zv/^\s*[*/]/s/\*\/\s*$/@*\//e<CR>:'y,'zv/^\s*[*/]/s/^\s\+\*/@@@@@* /e<CR>:'y,'zv/^\s*[*/]/s/^@@@@@\*\(.*[^*/]\)$/&@*/e<CR>'yjma'zk:AlignCtrl v ^\s*[*/#]<CR>:call AlignMaps#StdAlign(1)<cr>:'y,'zv/^\s*[*/]/s/@ //ge<CR>:'y,'zv/^\s*[*/]/s/\(\s*\);/;\1/e<CR>:'y,'zv/^#/s/# //e<CR>:'y,'zv/^\s\+[*/#]/s/\([^/*]\)\(\*\+\)\( \+\)/\1\3\2/e<CR>:'y,'zv/^\s\+[*/#]/s/\((\+\)\( \+\)\*/\2\1*/e<CR>:'y,'zv/^\s\+[*/#]/s/^\(\s\+\) \*/\1*/e<CR>:'y,'zv/^\s\+[*/#]/s/[ \t@]*$//e<CR>:'y,'zs/^[*]/ */e<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_adef	<SID>WS:AlignPush<CR>:AlignCtrl v ^\s*\(\/\*\<bar>\/\/\)<CR>:'a,.v/^\s*\(\/\*\<bar>\/\/\)/s/^\(\s*\)#\(\s\)*define\s*\(\I[a-zA-Z_0-9(),]*\)\s*\(.\{-}\)\($\<Bar>\/\*\)/#\1\2define @\3@\4@\5/e<CR>:'a,.v/^\s*\(\/\*\<bar>\/\/\)/s/\($\<Bar>\*\/\)/@&/e<CR>'zk:call AlignMaps#StdAlign(1)<cr>'yjma'zk:'a,.v/^\s*\(\/\*\<bar>\/\/\)/s/ @//g<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_afnc	:<c-u>set lz<CR>:silent call AlignMaps#Afnc()<CR>:set nolz<CR>
+nnoremap <silent> <script> <Plug>AM_aunum	<SID>WS:'a,'zs/\([-+]\=\d\+\)\([eE][-+]\d\+\)\=/\1#\2/ge<CR>:'a,'zs/\([.eE][-+]\=\d\+\)#/\1/ge<CR>:'a,'zs/#\././ge<CR>:'a,'zs/[-+]\=\%(\d\+\%([.#]\d*\)\=\<bar>[.#]\d\+\)\%([eE][-+]\=\d\+\)\=/@&@/ge<CR>:AlignCtrl Imp0P0r<CR>:'a,'zAlign [@#.]<CR>:'a,'zs/\([.#]\)\(\s\+\)\(\d*\%([eE][-+]\=\d\+\)\=\)@/\1\3\2@/ge<CR>:'a,'zs/@//<CR>:'a,'zs/[#@]/ /ge<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_aenum	<SID>WS:'a,'zs/\([-+]\=\d\+\)\([eE][-+]\d\+\)\=/\1#\2/ge<CR>:'a,'zs/\([,eE][-+]\=\d\+\)#/\1/ge<CR>:'a,'zs/#,/,/ge<CR>:'a,'zs/[-+]\=\%(\d\+\%([,#]\d*\)\=\<bar>[,#]\d\+\)\%([eE][-+]\=\d\+\)\=/@&@/ge<CR>:AlignCtrl Imp0P0r<CR>:'a,'zAlign [@#,]<CR>:'a,'zs/\([,#]\)\(\s\+\)\(\d*\%([eE][-+]\=\d\+\)\=\)@/\1\3\2@/ge<CR>:'a,'zs/@//<CR>:'a,'zs/[#@]/ /ge<CR><SID>WE
+" ---------------------------------------------------------------------
+" html table alignment	{{{2
+if !hasmapto('<Plug>AM_Htd')|map <unique> <Leader>Htd	<Plug>AM_Htd|endif
+map <silent> <script> <Plug>AM_Htd <SID>WS:'y,'zs%<[tT][rR]><[tT][dD][^>]\{-}>\<Bar></[tT][dD]><[tT][dD][^>]\{-}>\<Bar></[tT][dD]></[tT][rR]>%@&@%g<CR>'yjma'zk:AlignCtrl m=Ilp1P0 @<CR>:'a,.Align<CR>:'y,'zs/ @/@/<CR>:'y,'zs/@ <[tT][rR]>/<[tT][rR]>/ge<CR>:'y,'zs/@//ge<CR><SID>WE
+
+" ---------------------------------------------------------------------
+" character-based right-justified alignment maps {{{2
+if !hasmapto('<Plug>AM_T|')|call AlignMaps#MakeMap("T|")|endif
+if !hasmapto('<Plug>AM_T#')	 |call AlignMaps#MakeMap("T#")|endif
+if !hasmapto('<Plug>AM_T,')	 |call AlignMaps#MakeMap("T,")|endif
+if !hasmapto('<Plug>AM_Ts,') |call AlignMaps#MakeMap("Ts,")|endif
+if !hasmapto('<Plug>AM_T:')	 |call AlignMaps#MakeMap("T:")|endif
+if !hasmapto('<Plug>AM_T;')	 |call AlignMaps#MakeMap("T;")|endif
+if !hasmapto('<Plug>AM_T<')	 |call AlignMaps#MakeMap("T<")|endif
+if !hasmapto('<Plug>AM_T=')	 |call AlignMaps#MakeMap("T=")|endif
+if !hasmapto('<Plug>AM_T?')	 |call AlignMaps#MakeMap("T?")|endif
+if !hasmapto('<Plug>AM_T@')	 |call AlignMaps#MakeMap("T@")|endif
+if !hasmapto('<Plug>AM_TW@') |call AlignMaps#MakeMap("TW@")|endif
+if !hasmapto('<Plug>AM_Tab') |call AlignMaps#MakeMap("Tab")|endif
+if !hasmapto('<Plug>AM_Tsp') |call AlignMaps#MakeMap("Tsp")|endif
+if !hasmapto('<Plug>AM_T~')	 |call AlignMaps#MakeMap("T~")|endif
+
+nnoremap <silent> <script> <Plug>AM_T| <SID>WS:AlignCtrl mIp0P0=r <Bar><CR>:'a,.Align<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_T#   <SID>WS:AlignCtrl mIp0P0=r #<CR>:'a,.Align<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_T,   <SID>WS:AlignCtrl mIp0P1=r ,<CR>:'a,.Align<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_Ts,  <SID>WS:AlignCtrl mIp0P1=r ,<CR>:'a,.Align<CR>:'a,.s/\(\s*\),/,\1/ge<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_T:   <SID>WS:AlignCtrl mIp1P1=r :<CR>:'a,.Align<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_T;   <SID>WS:AlignCtrl mIp0P0=r ;<CR>:'a,.Align<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_T<   <SID>WS:AlignCtrl mIp0P0=r <<CR>:'a,.Align<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_T=   <SID>WS:'a,'z-1s/\s\+\([*/+\-%<Bar>&\~^]\==\)/ \1/e<CR>:'a,'z-1s@ \+\([*/+\-%<Bar>&\~^]\)=@\1=@ge<CR>:'a,'z-1s/; */;@/e<CR>:'a,'z-1s/==/\="\<Char-0x0f>\<Char-0x0f>"/ge<CR>:'a,'z-1s/!=/\x="!\<Char-0x0f>"/ge<CR>:AlignCtrl mIp1P1=r = @<CR>:AlignCtrl g =<CR>:'a,'z-1Align<CR>:'a,'z-1s/; *@/;/e<CR>:'a,'z-1s/; *$/;/e<CR>:'a,'z-1s@\([*/+\-%<Bar>&\~^]\)\( \+\)=@\2\1=@ge<CR>:'a,'z-1s/\( \+\);/;\1/ge<CR>:'a,'z-1s/\xff/=/ge<CR><SID>WE:exe "norm <Plug>acom"
+nnoremap <silent> <script> <Plug>AM_T?   <SID>WS:AlignCtrl mIp0P0=r ?<CR>:'a,.Align<CR>:'y,'zs/ \( *\);/;\1/ge<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_T@   <SID>WS:AlignCtrl mIp0P0=r @<CR>:'a,.Align<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_TW@  <SID>WS:AlignCtrl mWp0P0=r @<CR>:'a,.Align<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_Tab  <SID>WS:'a,.s/^\(\t*\)\(.*\)/\=submatch(1).escape(substitute(submatch(2),'\t','@','g'),'\')/<CR>:AlignCtrl mI=r @<CR>:'a,.Align<CR>:'y+1,'z-1s/@/ /g<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_Tsp  <SID>WS:'a,.s/^\(\s*\)\(.*\)/\=submatch(1).escape(substitute(submatch(2),'\s\+','@','g'),'\')/<CR>:AlignCtrl mI=r @<CR>:'a,.Align<CR>:'y+1,'z-1s/@/ /g<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_T~   <SID>WS:AlignCtrl mIp0P0=r ~<CR>:'a,.Align<CR>:'y,'zs/ \( *\);/;\1/ge<CR><SID>WE
+
+" ---------------------------------------------------------------------
+" character-based left-justified alignment maps {{{2
+if !hasmapto('<Plug>AM_t|','n')	|call AlignMaps#MakeMap("t|")|endif
+if !hasmapto('<Plug>AM_t#','n')		|call AlignMaps#MakeMap("t#")|endif
+if !hasmapto('<Plug>AM_t,','n')		|call AlignMaps#MakeMap("t,")|endif
+if !hasmapto('<Plug>AM_t:','n')		|call AlignMaps#MakeMap("t:")|endif
+if !hasmapto('<Plug>AM_t;','n')		|call AlignMaps#MakeMap("t;")|endif
+if !hasmapto('<Plug>AM_t<','n')		|call AlignMaps#MakeMap("t<")|endif
+if !hasmapto('<Plug>AM_t=','n')		|call AlignMaps#MakeMap("t=")|endif
+if !hasmapto('<Plug>AM_ts,','n')	|call AlignMaps#MakeMap("ts,")|endif
+if !hasmapto('<Plug>AM_ts:','n')	|call AlignMaps#MakeMap("ts:")|endif
+if !hasmapto('<Plug>AM_ts;','n')	|call AlignMaps#MakeMap("ts;")|endif
+if !hasmapto('<Plug>AM_ts<','n')	|call AlignMaps#MakeMap("ts<")|endif
+if !hasmapto('<Plug>AM_ts=','n')	|call AlignMaps#MakeMap("ts=")|endif
+if !hasmapto('<Plug>AM_w=','n')		|call AlignMaps#MakeMap("w=")|endif
+if !hasmapto('<Plug>AM_t?','n')		|call AlignMaps#MakeMap("t?")|endif
+if !hasmapto('<Plug>AM_t~','n')		|call AlignMaps#MakeMap("t~")|endif
+if !hasmapto('<Plug>AM_t@','n')		|call AlignMaps#MakeMap("t@")|endif
+if !hasmapto('<Plug>AM_tW@','n')	|call AlignMaps#MakeMap("tW@")|endif
+if !hasmapto('<Plug>AM_m=','n')		|call AlignMaps#MakeMap("m=")|endif
+if !hasmapto('<Plug>AM_tab','n')	|call AlignMaps#MakeMap("tab")|endif
+if !hasmapto('<Plug>AM_tml','n')	|call AlignMaps#MakeMap("tml")|endif
+if !hasmapto('<Plug>AM_tsp','n')	|call AlignMaps#MakeMap("tsp")|endif
+if !hasmapto('<Plug>AM_tsq','n')	|call AlignMaps#MakeMap("tsq")|endif
+if !hasmapto('<Plug>AM_tt','n')		|call AlignMaps#MakeMap("tt")|endif
+if !hasmapto('<Plug>AM_tab','n')	|call AlignMaps#MakeMap("tab")|endif
+
+" <Plug> normal mode mappings
+nnoremap <silent> <script> <Plug>AM_t|	<SID>WS:AlignCtrl mIp0P0=l <Bar><CR>:'a,.Align<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_t#		<SID>WS:AlignCtrl mIp0P0=l #<CR>:'a,.Align<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_t,		<SID>WS:AlignCtrl mIp0P1=l ,<CR>:'a,.Align<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_t:		<SID>WS:AlignCtrl mIp1P1=l :<CR>:'a,.Align<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_t;		<SID>WS:AlignCtrl mIp0P1=l ;<CR>:'a,.Align<CR>:sil 'y,'zs/\( *\);/;\1/ge<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_t<		<SID>WS:AlignCtrl mIp0P0=l <<CR>:'a,.Align<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_t=		<SID>WS:call AlignMaps#Equals()<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_ts,		<SID>WS:AlignCtrl mIp0P1=l #\zs<CR>:'a,.Align<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_ts,		<SID>WS:AlignCtrl mIp0P1=l ,\zs<CR>:'a,.Align<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_ts:		<SID>WS:AlignCtrl mIp1P1=l :\zs<CR>:'a,.Align<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_ts;		<SID>WS:AlignCtrl mIp1P1=l ;\zs<CR>:'a,.Align<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_ts<		<SID>WS:AlignCtrl mIp1P1=l <\zs<CR>:'a,.Align<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_ts=		<SID>WS:AlignCtrl mIp1P1=l =\zs<CR>:'a,.Align<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_w=		<SID>WS:'a,'zg/=/s/\s\+\([*/+\-%<Bar>&\~^]\==\)/ \1/e<CR>:'a,'zg/=/s@ \+\([*/+\-%<Bar>&\~^]\)=@\1=@ge<CR>:'a,'zg/=/s/==/\="\<Char-0x0f>\<Char-0x0f>"/ge<CR>:'a,'zg/=/s/!=/\="!\<Char-0x0f>"/ge<CR>'zk:AlignCtrl mWp1P1=l =<CR>:AlignCtrl g =<CR>:'a,'z-1g/=/Align<CR>:'a,'z-1g/=/s@\([*/+\-%<Bar>&\~^!=]\)\( \+\)=@\2\1=@ge<CR>:'a,'z-1g/=/s/\( \+\);/;\1/ge<CR>:'a,'z-1v/^\s*\/[*/]/s/\/[*/]/@&@/e<CR>:'a,'z-1v/^\s*\/[*/]/s/\*\//@&/e<CR>'zk:call AlignMaps#StdAlign(1)<cr>:'y,'zs/^\(\s*\) @/\1/e<CR>:'a,'z-1g/=/s/\xff/=/ge<CR>:'y,'zg/=/s/ @//eg<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_t?		<SID>WS:AlignCtrl mIp0P0=l ?<CR>:'a,.Align<CR>:.,'zs/ \( *\);/;\1/ge<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_t~		<SID>WS:AlignCtrl mIp0P0=l ~<CR>:'a,.Align<CR>:'y,'zs/ \( *\);/;\1/ge<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_t@		<SID>WS:call AlignMaps#StdAlign(1)<cr><SID>WE
+nnoremap <silent> <script> <Plug>AM_tW@		<SID>WS:call AlignMaps#StdAlign(2)<cr><SID>WE
+nnoremap <silent> <script> <Plug>AM_m=		<SID>WS:'a,'zs/\s\+\([*/+\-%<Bar>&\~^]\==\)/ \1/e<CR>:'a,'zs@ \+\([*/+\-%<Bar>&\~^]\)=@\1=@ge<CR>:'a,'zs/==/\="\<Char-0x0f>\<Char-0x0f>"/ge<CR>:'a,'zs/!=/\="!\<Char-0x0f>"/ge<CR>'zk:AlignCtrl mIp1P1=l =<CR>:AlignCtrl g =<CR>:'a,'z-1Align<CR>:'a,'z-1s@\([*/+\-%<Bar>&\~^!=]\)\( \+\)=@\2\1=@ge<CR>:'a,'z-1s/\( \+\);/;\1/ge<CR>:'a,'z-s/%\ze[^=]/ @%@ /e<CR>'zk:call AlignMaps#StdAlign(1)<cr>:'y,'zs/^\(\s*\) @/\1/e<CR>:'a,'z-1s/\xff/=/ge<CR>:'y,'zs/ @//eg<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_tab		<SID>WS:'a,.s/^\(\t*\)\(.*\)$/\=submatch(1).escape(substitute(submatch(2),'\t',"\<Char-0x0f>",'g'),'\')/<CR>:if &ts == 1<bar>exe "AlignCtrl mI=lp0P0 \<Char-0x0f>"<bar>else<bar>exe "AlignCtrl mI=l"<bar>endif<CR>:'a,.Align <Char-0x0f><CR>:exe "'y+1,'z-1s/\<Char-0x0f>/".((&ts == 1)? '\t' : ' ')."/g"<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_tml		<SID>WS:AlignCtrl mWp1P0=l \\\@<!\\\s*$<CR>:'a,.Align<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_tsp		<SID>WS:keepj 'a,.s/^\(\s*\)\(.*\)/\=submatch(1).escape(substitute(submatch(2),'\s\+','@','g'),'\')/<CR>:AlignCtrl mI=lp0P0 @<CR>:'a,.Align<CR>:keepj 'y+1,'z-1s/@/ /g<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_tsq		<SID>WS:'a,.AlignReplaceQuotedSpaces<CR>:keepj 'a,.s/^\(\s*\)\(.*\)/\=submatch(1).substitute(submatch(2),'\s\+','@','g')/<CR>:AlignCtrl mIp0P0=l @<CR>:'a,.Align<CR>:keepj 'y+1,'z-1s/[%@]/ /g<CR><SID>WE
+nnoremap <silent> <script> <Plug>AM_tt		<SID>WS:AlignCtrl mIp1P1=l \\\@<!& \\\\<CR>:'a,.Align<CR><SID>WE
+
+" =====================================================================
+" Menu Support: {{{1
+"   ma ..move.. use menu
+"   v V or ctrl-v ..move.. use menu
+if has("menu") && has("gui_running") && &go =~# 'm' && !exists("s:firstmenu")
+ let s:firstmenu= 1
+ if !exists("g:DrChipTopLvlMenu")
+  let g:DrChipTopLvlMenu= "DrChip."
+ endif
+ if g:DrChipTopLvlMenu != ""
+  let s:mapleader = exists("g:mapleader")? g:mapleader : '\'
+  let s:emapleader= escape(s:mapleader,'\ ')
+  exe 'menu '.g:DrChipTopLvlMenu.'AlignMaps.<<\ and\ >><tab>'.s:emapleader.'a<	'.s:mapleader.'a<'
+  exe 'menu '.g:DrChipTopLvlMenu.'AlignMaps.Assignment\ =<tab>'.s:emapleader.'t=	'.s:mapleader.'t='
+  exe 'menu '.g:DrChipTopLvlMenu.'AlignMaps.Assignment\ :=<tab>'.s:emapleader.'a=	'.s:mapleader.'a='
+  exe 'menu '.g:DrChipTopLvlMenu.'AlignMaps.Backslashes<tab>'.s:emapleader.'tml	'.s:mapleader.'tml'
+  exe 'menu '.g:DrChipTopLvlMenu.'AlignMaps.Breakup\ Comma\ Declarations<tab>'.s:emapleader.'a,	'.s:mapleader.'a,'
+  exe 'menu '.g:DrChipTopLvlMenu.'AlignMaps.C\ Comment\ Box<tab>'.s:emapleader.'abox	'.s:mapleader.'abox'
+  exe 'menu '.g:DrChipTopLvlMenu.'AlignMaps.Commas<tab>'.s:emapleader.'t,	'.s:mapleader.'t,'
+  exe 'menu '.g:DrChipTopLvlMenu.'AlignMaps.Commas<tab>'.s:emapleader.'ts,	'.s:mapleader.'ts,'
+  exe 'menu '.g:DrChipTopLvlMenu.'AlignMaps.Commas\ With\ Strings<tab>'.s:emapleader.'tsq	'.s:mapleader.'tsq'
+  exe 'menu '.g:DrChipTopLvlMenu.'AlignMaps.Comments<tab>'.s:emapleader.'acom	'.s:mapleader.'acom'
+  exe 'menu '.g:DrChipTopLvlMenu.'AlignMaps.Comments\ Only<tab>'.s:emapleader.'aocom	'.s:mapleader.'aocom'
+  exe 'menu '.g:DrChipTopLvlMenu.'AlignMaps.Declaration\ Comments<tab>'.s:emapleader.'adcom	'.s:mapleader.'adcom'
+  exe 'menu '.g:DrChipTopLvlMenu.'AlignMaps.Declarations<tab>'.s:emapleader.'adec	'.s:mapleader.'adec'
+  exe 'menu '.g:DrChipTopLvlMenu.'AlignMaps.Definitions<tab>'.s:emapleader.'adef	'.s:mapleader.'adef'
+  exe 'menu '.g:DrChipTopLvlMenu.'AlignMaps.Function\ Header<tab>'.s:emapleader.'afnc	'.s:mapleader.'afnc'
+  exe 'menu '.g:DrChipTopLvlMenu.'AlignMaps.Html\ Tables<tab>'.s:emapleader.'Htd	'.s:mapleader.'Htd'
+  exe 'menu '.g:DrChipTopLvlMenu.'AlignMaps.(\.\.\.)?\.\.\.\ :\ \.\.\.<tab>'.s:emapleader.'a?	'.s:mapleader.'a?'
+  exe 'menu '.g:DrChipTopLvlMenu.'AlignMaps.Numbers<tab>'.s:emapleader.'anum	'.s:mapleader.'anum'
+  exe 'menu '.g:DrChipTopLvlMenu.'AlignMaps.Numbers\ (American-Style)<tab>'.s:emapleader.'aunum	<Leader>aunum	'.s:mapleader.'aunum	<Leader>aunum'
+  exe 'menu '.g:DrChipTopLvlMenu.'AlignMaps.Numbers\ (Euro-Style)<tab>'.s:emapleader.'aenum	'.s:mapleader.'aenum'
+  exe 'menu '.g:DrChipTopLvlMenu.'AlignMaps.Spaces\ (Left\ Justified)<tab>'.s:emapleader.'tsp	'.s:mapleader.'tsp'
+  exe 'menu '.g:DrChipTopLvlMenu.'AlignMaps.Spaces\ (Right\ Justified)<tab>'.s:emapleader.'Tsp	'.s:mapleader.'Tsp'
+  exe 'menu '.g:DrChipTopLvlMenu.'AlignMaps.Statements\ With\ Percent\ Style\ Comments<tab>'.s:emapleader.'m=	'.s:mapleader.'m='
+  exe 'menu '.g:DrChipTopLvlMenu.'AlignMaps.Symbol\ <<tab>'.s:emapleader.'t<	'.s:mapleader.'t<'
+  exe 'menu '.g:DrChipTopLvlMenu.'AlignMaps.Symbol\ \|<tab>'.s:emapleader.'t\|	'.s:mapleader.'t|'
+  exe 'menu '.g:DrChipTopLvlMenu.'AlignMaps.Symbol\ @<tab>'.s:emapleader.'t@	'.s:mapleader.'t@'
+  exe 'menu '.g:DrChipTopLvlMenu.'AlignMaps.Symbol\ #<tab>'.s:emapleader.'t#	'.s:mapleader.'t#'
+  exe 'menu '.g:DrChipTopLvlMenu.'AlignMaps.Tabs<tab>'.s:emapleader.'tab	'.s:mapleader.'tab'
+  unlet s:mapleader
+  unlet s:emapleader
+ endif
+endif
+
+" =====================================================================
+"  Restore: {{{1
+let &cpo= s:keepcpo
+unlet s:keepcpo
+
+" ==============================================================================
+"  Modelines: {{{1
+" vim: ts=4 nowrap fdm=marker
diff --git a/plugin/AlignPlugin.vim b/plugin/AlignPlugin.vim
new file mode 100644
index 0000000..50c53d6
--- /dev/null
+++ b/plugin/AlignPlugin.vim
@@ -0,0 +1,41 @@
+" AlignPlugin: tool to align multiple fields based on one or more separators
+"   Author:	 Charles E. Campbell
+"   Date:    Nov 02, 2008
+" GetLatestVimScripts: 294 1 :AutoInstall: Align.vim
+" GetLatestVimScripts: 1066 1 :AutoInstall: cecutil.vim
+" Copyright:    Copyright (C) 1999-2012 Charles E. Campbell {{{1
+"               Permission is hereby granted to use and distribute this code,
+"               with or without modifications, provided that this copyright
+"               notice is copied with it. Like anything else that's free,
+"               Align.vim is provided *as is* and comes with no warranty
+"               of any kind, either expressed or implied. By using this
+"               plugin, you agree that in no event will the copyright
+"               holder be liable for any damages resulting from the use
+"               of this software.
+"
+" Romans 1:16,17a : For I am not ashamed of the gospel of Christ, for it is {{{1
+" the power of God for salvation for everyone who believes; for the Jew first,
+" and also for the Greek.  For in it is revealed God's righteousness from
+" faith to faith.
+" ---------------------------------------------------------------------
+" Load Once: {{{1
+if &cp || exists("g:loaded_AlignPlugin")
+ finish
+endif
+let g:loaded_AlignPlugin = "v37"
+let s:keepcpo            = &cpo
+set cpo&vim
+
+" ---------------------------------------------------------------------
+" Public Interface: {{{1
+com! -bang -range -nargs=* Align <line1>,<line2>call Align#Align(<bang>0,<q-args>)
+com!       -range -nargs=0 AlignReplaceQuotedSpaces <line1>,<line2>call Align#AlignReplaceQuotedSpaces()
+com!              -nargs=* AlignCtrl call Align#AlignCtrl(<q-args>)
+com!              -nargs=0 AlignPush call Align#AlignPush()
+com!              -nargs=0 AlignPop  call Align#AlignPop()
+
+" ---------------------------------------------------------------------
+"  Restore: {{{1
+let &cpo= s:keepcpo
+unlet s:keepcpo
+" vim: ts=4 fdm=marker
diff --git a/plugin/cecutil.vim b/plugin/cecutil.vim
new file mode 100644
index 0000000..506b7bf
--- /dev/null
+++ b/plugin/cecutil.vim
@@ -0,0 +1,482 @@
+" cecutil.vim : save/restore window position
+"               save/restore mark position
+"               save/restore selected user maps
+"  Author:	Charles E. Campbell, Jr.
+"  Version:	17
+"  Date:	Sep 04, 2007
+"
+"  Saving Restoring Destroying Marks: {{{1
+"       call SaveMark(markname)       let savemark= SaveMark(markname)
+"       call RestoreMark(markname)    call RestoreMark(savemark)
+"       call DestroyMark(markname)
+"       commands: SM RM DM
+"
+"  Saving Restoring Destroying Window Position: {{{1
+"       call SaveWinPosn()        let winposn= SaveWinPosn()
+"       call RestoreWinPosn()     call RestoreWinPosn(winposn)
+"		\swp : save current window/buffer's position
+"		\rwp : restore current window/buffer's previous position
+"       commands: SWP RWP
+"
+"  Saving And Restoring User Maps: {{{1
+"       call SaveUserMaps(mapmode,maplead,mapchx,suffix)
+"       call RestoreUserMaps(suffix)
+"
+" GetLatestVimScripts: 1066 1 :AutoInstall: cecutil.vim
+"
+" You believe that God is one. You do well. The demons also {{{1
+" believe, and shudder. But do you want to know, vain man, that
+" faith apart from works is dead?  (James 2:19,20 WEB)
+
+" Load Once: {{{1
+if &cp || exists("g:loaded_cecutil")
+ finish
+endif
+let g:loaded_cecutil = "v17"
+let s:keepcpo        = &cpo
+set cpo&vim
+"DechoVarOn
+
+" -----------------------
+"  Public Interface: {{{1
+" -----------------------
+
+"  Map Interface: {{{2
+if !hasmapto('<Plug>SaveWinPosn')
+ map <unique> <Leader>swp <Plug>SaveWinPosn
+endif
+if !hasmapto('<Plug>RestoreWinPosn')
+ map <unique> <Leader>rwp <Plug>RestoreWinPosn
+endif
+nmap <silent> <Plug>SaveWinPosn		:call SaveWinPosn()<CR>
+nmap <silent> <Plug>RestoreWinPosn	:call RestoreWinPosn()<CR>
+
+" Command Interface: {{{2
+com! -bar -nargs=0 SWP	call SaveWinPosn()
+com! -bar -nargs=0 RWP	call RestoreWinPosn()
+com! -bar -nargs=1 SM	call SaveMark(<q-args>)
+com! -bar -nargs=1 RM	call RestoreMark(<q-args>)
+com! -bar -nargs=1 DM	call DestroyMark(<q-args>)
+
+if v:version < 630
+ let s:modifier= "sil "
+else
+ let s:modifier= "sil keepj "
+endif
+
+" ---------------------------------------------------------------------
+" SaveWinPosn: {{{1
+"    let winposn= SaveWinPosn()  will save window position in winposn variable
+"    call SaveWinPosn()          will save window position in b:cecutil_winposn{b:cecutil_iwinposn}
+"    let winposn= SaveWinPosn(0) will *only* save window position in winposn variable (no stacking done)
+fun! SaveWinPosn(...)
+"  call Dfunc("SaveWinPosn() a:0=".a:0)
+  if line(".") == 1 && getline(1) == ""
+"   call Dfunc("SaveWinPosn : empty buffer")
+   return ""
+  endif
+  let so_keep   = &so
+  let siso_keep = &siso
+  let ss_keep   = &ss
+  set so=0 siso=0 ss=0
+
+  let swline    = line(".")
+  let swcol     = col(".")
+  let swwline   = winline() - 1
+  let swwcol    = virtcol(".") - wincol()
+  let savedposn = "call GoWinbufnr(".winbufnr(0).")|silent ".swline
+  let savedposn = savedposn."|".s:modifier."norm! 0z\<cr>"
+  if swwline > 0
+   let savedposn= savedposn.":".s:modifier."norm! ".swwline."\<c-y>\<cr>"
+  endif
+  if swwcol > 0
+   let savedposn= savedposn.":".s:modifier."norm! 0".swwcol."zl\<cr>"
+  endif
+  let savedposn = savedposn.":".s:modifier."call cursor(".swline.",".swcol.")\<cr>"
+
+  " save window position in
+  " b:cecutil_winposn_{iwinposn} (stack)
+  " only when SaveWinPosn() is used
+  if a:0 == 0
+   if !exists("b:cecutil_iwinposn")
+   	let b:cecutil_iwinposn= 1
+   else
+   	let b:cecutil_iwinposn= b:cecutil_iwinposn + 1
+   endif
+"   call Decho("saving posn to SWP stack")
+   let b:cecutil_winposn{b:cecutil_iwinposn}= savedposn
+  endif
+
+  let &so   = so_keep
+  let &siso = siso_keep
+  let &ss   = ss_keep
+
+"  if exists("b:cecutil_iwinposn")	 " Decho
+"   call Decho("b:cecutil_winpos{".b:cecutil_iwinposn."}[".b:cecutil_winposn{b:cecutil_iwinposn}."]")
+"  else                      " Decho
+"   call Decho("b:cecutil_iwinposn doesn't exist")
+"  endif                     " Decho
+"  call Dret("SaveWinPosn [".savedposn."]")
+  return savedposn
+endfun
+
+" ---------------------------------------------------------------------
+" RestoreWinPosn: {{{1
+fun! RestoreWinPosn(...)
+"  call Dfunc("RestoreWinPosn() a:0=".a:0)
+"  call Decho("getline(1)<".getline(1).">")
+"  call Decho("line(.)=".line("."))
+  if line(".") == 1 && getline(1) == ""
+"   call Dfunc("RestoreWinPosn : empty buffer")
+   return ""
+  endif
+  let so_keep   = &so
+  let siso_keep = &siso
+  let ss_keep   = &ss
+  set so=0 siso=0 ss=0
+
+  if a:0 == 0 || a:1 == ""
+   " use saved window position in b:cecutil_winposn{b:cecutil_iwinposn} if it exists
+   if exists("b:cecutil_iwinposn") && exists("b:cecutil_winposn{b:cecutil_iwinposn}")
+"   	call Decho("using stack b:cecutil_winposn{".b:cecutil_iwinposn."}<".b:cecutil_winposn{b:cecutil_iwinposn}.">")
+	try
+     exe "silent! ".b:cecutil_winposn{b:cecutil_iwinposn}
+	catch /^Vim\%((\a\+)\)\=:E749/
+	 " ignore empty buffer error messages
+	endtry
+    " normally drop top-of-stack by one
+    " but while new top-of-stack doesn't exist
+    " drop top-of-stack index by one again
+	if b:cecutil_iwinposn >= 1
+	 unlet b:cecutil_winposn{b:cecutil_iwinposn}
+	 let b:cecutil_iwinposn= b:cecutil_iwinposn - 1
+	 while b:cecutil_iwinposn >= 1 && !exists("b:cecutil_winposn{b:cecutil_iwinposn}")
+	  let b:cecutil_iwinposn= b:cecutil_iwinposn - 1
+	 endwhile
+	 if b:cecutil_iwinposn < 1
+	  unlet b:cecutil_iwinposn
+	 endif
+	endif
+   else
+   	echohl WarningMsg
+	echomsg "***warning*** need to SaveWinPosn first!"
+	echohl None
+   endif
+
+  else	 " handle input argument
+"   call Decho("using input a:1<".a:1.">")
+   " use window position passed to this function
+   exe "silent ".a:1
+   " remove a:1 pattern from b:cecutil_winposn{b:cecutil_iwinposn} stack
+   if exists("b:cecutil_iwinposn")
+    let jwinposn= b:cecutil_iwinposn
+    while jwinposn >= 1                     " search for a:1 in iwinposn..1
+        if exists("b:cecutil_winposn{jwinposn}")    " if it exists
+         if a:1 == b:cecutil_winposn{jwinposn}      " and the pattern matches
+       unlet b:cecutil_winposn{jwinposn}            " unlet it
+       if jwinposn == b:cecutil_iwinposn            " if at top-of-stack
+        let b:cecutil_iwinposn= b:cecutil_iwinposn - 1      " drop stacktop by one
+       endif
+      endif
+     endif
+     let jwinposn= jwinposn - 1
+    endwhile
+   endif
+  endif
+
+  " seems to be something odd: vertical motions after RWP
+  " cause jump to first column.  Following fixes that
+  if wincol() > 1
+   silent norm! hl
+  elseif virtcol(".") < virtcol("$")
+   silent norm! lh
+  endif
+
+  let &so   = so_keep
+  let &siso = siso_keep
+  let &ss   = ss_keep
+
+"  call Dret("RestoreWinPosn")
+endfun
+
+" ---------------------------------------------------------------------
+" GoWinbufnr: go to window holding given buffer (by number) {{{1
+"   Prefers current window; if its buffer number doesn't match,
+"   then will try from topleft to bottom right
+fun! GoWinbufnr(bufnum)
+"  call Dfunc("GoWinbufnr(".a:bufnum.")")
+  if winbufnr(0) == a:bufnum
+"   call Dret("GoWinbufnr : winbufnr(0)==a:bufnum")
+   return
+  endif
+  winc t
+  let first=1
+  while winbufnr(0) != a:bufnum && (first || winnr() != 1)
+  	winc w
+	let first= 0
+   endwhile
+"  call Dret("GoWinbufnr")
+endfun
+
+" ---------------------------------------------------------------------
+" SaveMark: sets up a string saving a mark position. {{{1
+"           For example, SaveMark("a")
+"           Also sets up a global variable, g:savemark_{markname}
+fun! SaveMark(markname)
+"  call Dfunc("SaveMark(markname<".a:markname.">)")
+  let markname= a:markname
+  if strpart(markname,0,1) !~ '\a'
+   let markname= strpart(markname,1,1)
+  endif
+"  call Decho("markname=".markname)
+
+  let lzkeep  = &lz
+  set lz
+
+  if 1 <= line("'".markname) && line("'".markname) <= line("$")
+   let winposn               = SaveWinPosn(0)
+   exe s:modifier."norm! `".markname
+   let savemark              = SaveWinPosn(0)
+   let g:savemark_{markname} = savemark
+   let savemark              = markname.savemark
+   call RestoreWinPosn(winposn)
+  else
+   let g:savemark_{markname} = ""
+   let savemark              = ""
+  endif
+
+  let &lz= lzkeep
+
+"  call Dret("SaveMark : savemark<".savemark.">")
+  return savemark
+endfun
+
+" ---------------------------------------------------------------------
+" RestoreMark: {{{1
+"   call RestoreMark("a")  -or- call RestoreMark(savemark)
+fun! RestoreMark(markname)
+"  call Dfunc("RestoreMark(markname<".a:markname.">)")
+
+  if strlen(a:markname) <= 0
+"   call Dret("RestoreMark : no such mark")
+   return
+  endif
+  let markname= strpart(a:markname,0,1)
+  if markname !~ '\a'
+   " handles 'a -> a styles
+   let markname= strpart(a:markname,1,1)
+  endif
+"  call Decho("markname=".markname." strlen(a:markname)=".strlen(a:markname))
+
+  let lzkeep  = &lz
+  set lz
+  let winposn = SaveWinPosn(0)
+
+  if strlen(a:markname) <= 2
+   if exists("g:savemark_{markname}") && strlen(g:savemark_{markname}) != 0
+	" use global variable g:savemark_{markname}
+"	call Decho("use savemark list")
+	call RestoreWinPosn(g:savemark_{markname})
+	exe "norm! m".markname
+   endif
+  else
+   " markname is a savemark command (string)
+"	call Decho("use savemark command")
+   let markcmd= strpart(a:markname,1)
+   call RestoreWinPosn(markcmd)
+   exe "norm! m".markname
+  endif
+
+  call RestoreWinPosn(winposn)
+  let &lz       = lzkeep
+
+"  call Dret("RestoreMark")
+endfun
+
+" ---------------------------------------------------------------------
+" DestroyMark: {{{1
+"   call DestroyMark("a")  -- destroys mark
+fun! DestroyMark(markname)
+"  call Dfunc("DestroyMark(markname<".a:markname.">)")
+
+  " save options and set to standard values
+  let reportkeep= &report
+  let lzkeep    = &lz
+  set lz report=10000
+
+  let markname= strpart(a:markname,0,1)
+  if markname !~ '\a'
+   " handles 'a -> a styles
+   let markname= strpart(a:markname,1,1)
+  endif
+"  call Decho("markname=".markname)
+
+  let curmod  = &mod
+  let winposn = SaveWinPosn(0)
+  1
+  let lineone = getline(".")
+  exe "k".markname
+  d
+  put! =lineone
+  let &mod    = curmod
+  call RestoreWinPosn(winposn)
+
+  " restore options to user settings
+  let &report = reportkeep
+  let &lz     = lzkeep
+
+"  call Dret("DestroyMark")
+endfun
+
+" ---------------------------------------------------------------------
+" QArgSplitter: to avoid \ processing by <f-args>, <q-args> is needed. {{{1
+" However, <q-args> doesn't split at all, so this one returns a list
+" with splits at all whitespace (only!), plus a leading length-of-list.
+" The resulting list:  qarglist[0] corresponds to a:0
+"                      qarglist[i] corresponds to a:{i}
+fun! QArgSplitter(qarg)
+"  call Dfunc("QArgSplitter(qarg<".a:qarg.">)")
+  let qarglist    = split(a:qarg)
+  let qarglistlen = len(qarglist)
+  let qarglist    = insert(qarglist,qarglistlen)
+"  call Dret("QArgSplitter ".string(qarglist))
+  return qarglist
+endfun
+
+" ---------------------------------------------------------------------
+" ListWinPosn:
+"fun! ListWinPosn()                                                        " Decho 
+"  if !exists("b:cecutil_iwinposn") || b:cecutil_iwinposn == 0             " Decho 
+"   call Decho("nothing on SWP stack")                                     " Decho
+"  else                                                                    " Decho
+"   let jwinposn= b:cecutil_iwinposn                                       " Decho 
+"   while jwinposn >= 1                                                    " Decho 
+"    if exists("b:cecutil_winposn{jwinposn}")                              " Decho 
+"     call Decho("winposn{".jwinposn."}<".b:cecutil_winposn{jwinposn}.">") " Decho 
+"    else                                                                  " Decho 
+"     call Decho("winposn{".jwinposn."} -- doesn't exist")                 " Decho 
+"    endif                                                                 " Decho 
+"    let jwinposn= jwinposn - 1                                            " Decho 
+"   endwhile                                                               " Decho 
+"  endif                                                                   " Decho
+"endfun                                                                    " Decho 
+"com! -nargs=0 LWP	call ListWinPosn()                                    " Decho 
+
+" ---------------------------------------------------------------------
+" SaveUserMaps: this function sets up a script-variable (s:restoremap) {{{1
+"          which can be used to restore user maps later with
+"          call RestoreUserMaps()
+"
+"          mapmode - see :help maparg for its list
+"                    ex. "n" = Normal
+"                    If the first letter is u, then unmapping will be done
+"                    ex. "un" = Normal + unmapping
+"          maplead - see mapchx
+"          mapchx  - "<something>" handled as a single map item.
+"                    ex. "<left>"
+"                  - "string" a string of single letters which are actually
+"                    multiple two-letter maps (using the maplead:
+"                    maplead . each_character_in_string)
+"                    ex. maplead="\" and mapchx="abc" saves user mappings for
+"                        \a, \b, and \c
+"                    Of course, if maplead is "", then for mapchx="abc",
+"                    mappings for a, b, and c are saved.
+"                  - :something  handled as a single map item, w/o the ":"
+"                    ex.  mapchx= ":abc" will save a mapping for "abc"
+"          suffix  - a string unique to your plugin
+"                    ex.  suffix= "DrawIt"
+fun! SaveUserMaps(mapmode,maplead,mapchx,suffix)
+"  call Dfunc("SaveUserMaps(mapmode<".a:mapmode."> maplead<".a:maplead."> mapchx<".a:mapchx."> suffix<".a:suffix.">)")
+
+  if !exists("s:restoremap_{a:suffix}")
+   " initialize restoremap_suffix to null string
+   let s:restoremap_{a:suffix}= ""
+  endif
+
+  " set up dounmap: if 1, then save and unmap  (a:mapmode leads with a "u")
+  "                 if 0, save only
+  if a:mapmode =~ '^u'
+   let dounmap= 1
+   let mapmode= strpart(a:mapmode,1)
+  else
+   let dounmap= 0
+   let mapmode= a:mapmode
+  endif
+ 
+  " save single map :...something...
+  if strpart(a:mapchx,0,1) == ':'
+   let amap= strpart(a:mapchx,1)
+   if amap == "|" || amap == "\<c-v>"
+    let amap= "\<c-v>".amap
+   endif
+   let amap                    = a:maplead.amap
+   let s:restoremap_{a:suffix} = s:restoremap_{a:suffix}."|:silent! ".mapmode."unmap ".amap
+   if maparg(amap,mapmode) != ""
+    let maprhs                  = substitute(maparg(amap,mapmode),'|','<bar>','ge')
+   	let s:restoremap_{a:suffix} = s:restoremap_{a:suffix}."|:".mapmode."map ".amap." ".maprhs
+   endif
+   if dounmap
+    exe "silent! ".mapmode."unmap ".amap
+   endif
+ 
+  " save single map <something>
+  elseif strpart(a:mapchx,0,1) == '<'
+   let amap       = a:mapchx
+   if amap == "|" || amap == "\<c-v>"
+    let amap= "\<c-v>".amap
+   endif
+   let s:restoremap_{a:suffix} = s:restoremap_{a:suffix}."|silent! ".mapmode."unmap ".amap
+   if maparg(a:mapchx,mapmode) != ""
+    let maprhs                  = substitute(maparg(amap,mapmode),'|','<bar>','ge')
+   	let s:restoremap_{a:suffix} = s:restoremap_{a:suffix}."|".mapmode."map ".amap." ".maprhs
+   endif
+   if dounmap
+    exe "silent! ".mapmode."unmap ".amap
+   endif
+ 
+  " save multiple maps
+  else
+   let i= 1
+   while i <= strlen(a:mapchx)
+    let amap= a:maplead.strpart(a:mapchx,i-1,1)
+	if amap == "|" || amap == "\<c-v>"
+	 let amap= "\<c-v>".amap
+	endif
+    let s:restoremap_{a:suffix} = s:restoremap_{a:suffix}."|silent! ".mapmode."unmap ".amap
+    if maparg(amap,mapmode) != ""
+     let maprhs                  = substitute(maparg(amap,mapmode),'|','<bar>','ge')
+   	 let s:restoremap_{a:suffix} = s:restoremap_{a:suffix}."|".mapmode."map ".amap." ".maprhs
+    endif
+	if dounmap
+     exe "silent! ".mapmode."unmap ".amap
+	endif
+    let i= i + 1
+   endwhile
+  endif
+"  call Dret("SaveUserMaps : restoremap_".a:suffix.": ".s:restoremap_{a:suffix})
+endfun
+
+" ---------------------------------------------------------------------
+" RestoreUserMaps: {{{1
+"   Used to restore user maps saved by SaveUserMaps()
+fun! RestoreUserMaps(suffix)
+"  call Dfunc("RestoreUserMaps(suffix<".a:suffix.">)")
+  if exists("s:restoremap_{a:suffix}")
+   let s:restoremap_{a:suffix}= substitute(s:restoremap_{a:suffix},'|\s*$','','e')
+   if s:restoremap_{a:suffix} != ""
+"   	call Decho("exe ".s:restoremap_{a:suffix})
+    exe "silent! ".s:restoremap_{a:suffix}
+   endif
+   unlet s:restoremap_{a:suffix}
+  endif
+"  call Dret("RestoreUserMaps")
+endfun
+
+" ---------------------------------------------------------------------
+"  Restore: {{{1
+let &cpo= s:keepcpo
+unlet s:keepcpo
+
+" ---------------------------------------------------------------------
+"  Modelines: {{{1
+" vim: ts=4 fdm=marker
diff --git a/plugin/cscope.vim b/plugin/cscope.vim
new file mode 100644
index 0000000..b9ca444
--- /dev/null
+++ b/plugin/cscope.vim
@@ -0,0 +1,57 @@
+"=======================================================================================================================
+" CSCOPE: http://vim.wikia.com/wiki/Cscope
+"=======================================================================================================================
+
+augroup MAX_CSCOPE
+    if has('cscope') " compiled with cscope support?
+        set cscopetag  " CTRL-] uses cscope first, then ctags
+        set cscopeverbose
+
+        if has('quickfix')
+            set cscopequickfix=s+,c+,d+,i+,t+,e+
+        endif
+
+        if has('menu')
+            1001menu &Cscope.find.c\ symbol
+                        \<tab>s
+                        \ :cscope find s <cword><:cR>
+            1001menu &Cscope.find.definition
+                        \<tab>g
+                        \ :cscope find g <cword><:cR>
+            1001menu &Cscope.find.functions\ called\ by\ this
+                        \<tab>d
+                        \ :cscope find d <cword><:cR>
+            1001menu &Cscope.find.functions\ calling\ this
+                        \<tab>c
+                        \ :cscope find c <cword><:cR>
+            1001menu &Cscope.find.text\ string
+                        \<tab>t
+                        \ :cscope find t <cword><:cR>
+            1001menu &Cscope.find.egrep\ pattern
+                        \<tab>e
+                        \ :cscope find e <cword><:cR>
+            1001menu &Cscope.find.this\ file
+                        \<tab>f
+                        \ :cscope find f <cword><:cR>
+            1001menu &Cscope.find.files\ including\ this\ file
+                        \<tab>i
+                        \ :cscope find i <cword><:cR>
+            1001menu &Cscope.find.places\ where\ this\ symbol\ is\ assigned\ a\ value
+                        \<tab>a
+                        \ :cscope find a <cword><:cR>
+            1001menu &Cscope.-Sep1-
+                        \ :
+            1001menu &Cscope.create\ and\ add\ database
+                        \ :cscope kill -1<CR>:execute '!find -type f -regex ".*\.\(c\\|h\\|cpp\\|cxx\\|hh\\|hpp\\|hxx\)$" <bar> cscope -i- -b -q -v'<CR>:cscope add .<CR>
+            1001menu &Cscope.-Sep2-
+                        \ :
+            1001menu &Cscope.add\ \.
+                        \ :cscope add .<CR>
+            1001menu &Cscope.show
+                        \ :cscope show<CR>
+            1001menu &Cscope.reset
+                        \ :cscope reset<CR>
+        endif
+    endif
+augroup END " MAX_CSCOPE
+
diff --git a/plugin/jedi.vim b/plugin/jedi.vim
new file mode 100644
index 0000000..dca8838
--- /dev/null
+++ b/plugin/jedi.vim
@@ -0,0 +1,15 @@
+" JEDI: ==============================================================================================================
+augroup JEDI
+    if has("python") || has('python3')
+        let g:jedi#completions_enabled        = 0 " we do not need completions, because we have YouCompleteMe
+        let g:jedi#show_call_signatures       = 1 " which sadly does not support signatures like jedi
+        let g:jedi#show_call_signatures_delay = 0
+        let g:jedi#auto_vim_configure         = 0
+        let g:pymode_rope                     = 0 " https://github.com/davidhalter/jedi-vim/issues/163
+        " autocmd FileType python jedi.preload_module('os', 'sys', 'math')
+        " let g:pymode_options_max_line_length          = 120
+        " let g:syntastic_python_flake8_args='--ignore=F821,E302,E501,E241,E301'
+
+        packadd jedi-vim
+    endif " has("python")
+augroup END
diff --git a/plugin/max-change-icon.vim b/plugin/max-change-icon.vim
new file mode 100644
index 0000000..f544a5e
--- /dev/null
+++ b/plugin/max-change-icon.vim
@@ -0,0 +1,11 @@
+
+
+
+augroup ChangeIcon
+    "if filereadable("/usr/bin/xseticon")
+    "if filereadable("~/.vim/nvim.png")
+    " autocmd VimEnter * silent :execute "!xseticon -id $WINDOWID ~/.vim/nvim.png"
+    " autocmd VimLeave * silent :execute "!xseticon -id $WINDOWID /usr/share/icons/gnome/32x32/apps/xfce-terminal.png"
+    "endif
+    "endif
+augroup END
diff --git a/plugin/max-find-bash.vim b/plugin/max-find-bash.vim
new file mode 100644
index 0000000..a5e243b
--- /dev/null
+++ b/plugin/max-find-bash.vim
@@ -0,0 +1,9 @@
+"=======================================================================================================================
+" SHELL:
+" Many scripts rely on bash. We help to find the bash binary
+"=======================================================================================================================
+if filereadable("/bin/bash")
+    set shell=/bin/bash
+elseif filereadable("/usr/local/bin/bash")
+    set shell=/usr/local/bin/bash
+endif
diff --git a/plugin/max-fix-colorschemes.vim b/plugin/max-fix-colorschemes.vim
new file mode 100644
index 0000000..ac2af76
--- /dev/null
+++ b/plugin/max-fix-colorschemes.vim
@@ -0,0 +1,49 @@
+"=======================================================================================================================
+" COLOR SCHEME:
+"=======================================================================================================================
+function! ExtendColorTheme()
+    highlight! Bold            cterm=bold                  gui=bold
+    highlight! Italic          cterm=italic                gui=italic
+    highlight! Underline       cterm=underline             gui=underline
+    highlight! BoldUnderline   cterm=bold,underline        gui=bold,underline
+    highlight! BoldItalic      cterm=bold,Italic           gui=Bold,Italic
+    highlight! Todo            cterm=bold                  gui=bold            guibg=#ffffaa                                       guifg=#000000
+    highlight! Error           ctermbg=NONE                guibg=NONE
+    highlight! SpellBad        cterm=NONE                  gui=undercurl       guibg=NONE                                          guifg=red
+
+
+    highlight! link            SpecialKey                  NonText             | " makes tab stop (see listchars) less disturbing
+    highlight! link            EndOfBuffer                 Ignore
+    highlight! link            WildMenu                    Search
+    highlight! link            Convention                  Error
+    highlight! link            VertSplit                   NonText
+
+    highlight! link            Folded                      LineNr
+    highlight! link            SignColumn                  LineNr
+    highlight! link            FoldColumn                  LineNr
+
+    highlight! link            PmenuSbar                   Pmenu
+    highlight! PmenuThumb      cterm=inverse
+    highlight! MoreMsg         cterm=inverse
+
+
+endfunction
+autocmd ColorScheme * call ExtendColorTheme()
+
+
+if filereadable(expand("~/.vimrc_background")) && filereadable(expand("~/.config/base16-shell/colortest"))
+  let g:base16_shell_path  =  "~/.config/base16-shell/scripts"
+  let base16colorspace     =  256
+  set background=dark
+  source ~/.vimrc_background
+else
+  let g:PaperColor_Theme_Options = {
+        \   'theme': {
+        \     'default': {
+        \       'transparent_background': 0
+        \     }
+        \   }
+        \ }
+  set background=light
+  colorscheme PaperColor
+endif
diff --git a/plugin/max-function-menu.vim b/plugin/max-function-menu.vim
new file mode 100644
index 0000000..6c7308a
--- /dev/null
+++ b/plugin/max-function-menu.vim
@@ -0,0 +1,173 @@
+augroup MAX_FUNCTION_MENU
+    if has('menu')
+        source $VIMRUNTIME/menu.vim
+        set wildmenu
+        set cpo-=<
+        set wcm=<C-Z>
+
+        01menu &Functions.toggle\ file\ browser
+                    \<Tab><leader><leader>
+                    \ <leader><leader>
+        01menu &Functions.-Sep0- :
+
+        01menu &Functions.help
+                    \<Tab><F1>
+                    \ <F1>
+        01menu &Functions.bp:\ previous\ buffer
+                    \<Tab><F2>
+                    \ <F2>
+        01menu &Functions.bn:\ next\ buffer
+                    \<Tab><F3>
+                    \ <F3>
+        01menu &Functions.^wc\:\ close\ window
+                    \<Tab><F4>
+                    \ <F4>
+        01menu &Functions.-Sep1- :
+
+        01menu &Functions.make
+                    \<Tab><F5>
+                    \ <F5>
+        01menu &Functions.clear\ matches,\ update\ viewport
+                    \<Tab><F6>
+                    \ <F6>
+        01menu &Functions.copen\:\ show\ quickfix\ list
+                    \<Tab><F7>
+                    \ <F7>
+        01menu &Functions.lopen\:\ show\ location\ list
+                    \<Tab><F8>
+                    \ <F8>
+        01menu &Functions.-Sep2- :
+
+        01menu &Functions.toggle\ tagbar
+                    \<Tab><F9>
+                    \ <F9>
+
+        if has("gui_running") == 0
+            " in the gui F10 already triggers the menu, not in a terminal vim, so upgrade that...
+            map <F10> :emenu <C-Z>
+        endif
+        01menu &Functions.activate\ menu\ (:emenu)
+                    \<Tab><F10>
+                    \ <F10>
+
+        01menu &Functions.undef11
+                    \<Tab><F11>
+                    \ <F11>
+        01menu &Functions.undef12
+                    \<Tab><F12>
+                    \ <F12>
+        01menu &Functions.-Sep2- :
+
+
+        09menu &Directory.print\ current\ directory
+                    \<Tab>:pwd
+                    \ :pwd<CR>
+
+        09menu &Directory.-Sep- :
+
+        09menu &Directory.Change\ to\ GIT\ root
+                    \<Tab>:Gcd
+                    \ :Gcd<CR>:pwd<CR>
+
+        09menu &Directory.Change\ to\ current\ buffers\ directory\ (global)
+                    \<tab>:cd\ %:p:h
+                    \ :cd %:h<CR>:pwd<CR>
+
+        09menu &Directory.Change\ to\ current\ buffers\ directory\ (local\ window)<tab>:lcd\ %:p:h
+                    \ :lcd %:p:h<CR>:pwd<CR>
+
+        menu &Git.&Display\ uncommited\ files\ in\ location\ list
+                    \ :call setloclist(0, map(systemlist("git diff --name-only --pretty=''"), {_, p->{'filename': fnamemodify(p, ':.')}}))<CR>:lopen<CR>
+        menu &Git.&Display\ recently\ changed\ files\ in\ quickfix\ list
+                    \ :call setqflist([], 'r', {'title': 'Recently changed in GIT', 'items':map(systemlist("git show --name-only --pretty=''"), {_, p->{'filename': fnamemodify(p, ':.')}}) })<CR>:copen<CR>
+        menu &Git.&Display\ last\ changes
+                    \ :let g:signify_vcs_cmds={'git': 'git diff --no-color --no-ext-diff -U0 HEAD^ -- %f'}<CR>:SignifyRefresh<CR>
+        menu &Git.&Display\ unmerged\ files\ in\ location\ list
+                    \ :call setloclist(0, map(systemlist("git diff --name-only --diff-filter=U \| uniq"), {_, p->{'filename': fnamemodify(p, ':.')}}))<CR>:lopen<CR>
+        menu &Git.&Display\ significance\ of\ changes
+                    \ :!git diff --stat HEAD~1..HEAD
+        menu &Git.&Display\ Changed\ files\ compared\ to\ master
+                    \ :!git diff --name-status ..master
+
+        menu &Match.Clear\ All\ Matches
+                    \<Tab><F6>
+                    \ :call clearmatches()<CR>
+
+        menu &Match.-Sep- :
+
+        menu &Match.&dispensable\ white\ spaces
+                    \ :call matchadd("Convention", '\s\+$', 0)<CR>
+
+        menu &Match.&long\ lines\ (exeeding\ textwidth)
+                    \ :call matchadd("Convention", '\%>'.&textwidth.'v.', 0)<CR>
+
+        menu &Match.Highlight\ current\ file\ name
+                    \ :call matchadd("Search", escape(expand('%:t'), '.'))<CR>
+
+        " :execute ':match SpellBad /'.escape(expand('%:t'), '.').'/'<CR>
+
+        menu &Window.-Sep- :
+
+
+        menu &Window.Scratch
+                    \ :Scratch<CR>
+
+
+        menu &Find.file\ under\ the\ cursor
+                    \<Tab>gf
+                    \ gf
+
+        menu &Find.Open\ search\ results\ in\ location\ list
+                    \<Tab>:gf
+                    \ :execute ':vimgrep /'.escape(getreg('/'), '.').'/g %'<CR>
+                    \ :copen<CR>
+
+        menu &Changes.list
+                    \<Tab>:changes
+                    \ :changes<CR>
+        menu &Changes.-Sep- :
+        menu &Changes.previous
+                    \<Tab>g;
+                    \ g;
+        menu &Changes.next
+                    \<Tab>g,
+                    \ g,
+        menu &List.location.signs\ to\ list
+                    \<Tab>CMD
+                    \ :execute ":call setloclist(0, map(get(getbufinfo('%')[0], 'signs'), {_, p->extend(p, {'bufnr':buffer_number('.'), 'text':get(p, 'name')})}))"<CR>
+        menu &List.location.list\ to\ signs
+                    \<Tab>CMD
+                    \ :call execute(extend(['sign define LocationListEntry text=L', 'sign unplace *'], map(getloclist('%'),  {key, val->'sign place '.(key+100).' name=LocationListEntry line='.val['lnum'].' buffer='.buffer_number('%')})))<CR>
+        menu &Jump.list
+                    \<Tab>:jumps
+                    \ :jumps<CR>
+        menu &Jump.-Sep1- :
+        menu &Jump.previous\ position
+                    \<Tab>CTRL-O
+                    \ <C-O>
+        menu &Jump.next\ position
+                    \<Tab>CTRL-I
+                    \ <C-I>
+        menu &Jump.-Sep2- :
+        menu &Jump.clear\ list
+                    \<Tab>:clearjumps
+                    \ :clearjumps
+
+        1000menu &Tag.list
+                    \<Tab>:tags
+                    \ :tags<CR>
+        1000menu &Tag.selection\ list
+                    \<Tab>:ts
+                    \ :ts<CR>
+
+        1000menu &Tag.-Sep1- :
+
+        1000menu &Tag.stack.jump\ older
+                    \<Tab><C-T>
+                    \ :po
+        1000menu &Tag.stack.jump\
+                    \<Tab>:ta
+                    \ :ta
+    endif
+augroup END " MAX_FUNCTION_MENU
+
diff --git a/plugin/max-highlight-word-under-cursor.vim b/plugin/max-highlight-word-under-cursor.vim
new file mode 100644
index 0000000..d557b40
--- /dev/null
+++ b/plugin/max-highlight-word-under-cursor.vim
@@ -0,0 +1,18 @@
+"=======================================================================================================================
+" HIGHLIGHT_WORD_UNDER_CURSOR:
+"=======================================================================================================================
+
+let w:m1 = 0
+function! HighlightWordUnderCursor()
+    if(exists('w:m1') && w:m1 > 0)
+        silent! call matchdelete(w:m1)
+        let w:m1 = 0
+    endif
+    let l:currentword = escape(expand('<cword>'), '.')
+    if(strlen(l:currentword) > 0)
+        let w:m1=100
+        silent! call matchadd('BoldUnderline', '\<'.l:currentword.'\>', -1, w:m1)
+    endif
+endfunction
+
+autocmd CursorHold,CursorHoldI * call HighlightWordUnderCursor()
diff --git a/plugin/max-set-window-title.vim b/plugin/max-set-window-title.vim
new file mode 100644
index 0000000..1a84ac3
--- /dev/null
+++ b/plugin/max-set-window-title.vim
@@ -0,0 +1,21 @@
+
+
+augroup SET_WINDOW_TITLE
+    set title
+    set titlelen=40
+
+    " set window title for screen(3)
+    " if &term == "screen" || &term == "xterm" 
+    if &term == "screen"
+        set t_ts=k
+        set t_fs=\
+    endif
+
+    " autocmd BufEnter * let &titlestring = hostname() . "[vim(" . expand("%:t") . ")]"
+    " autocmd CursorHold * let &titlestring = "%t %y ".$USER."@".hostname().":%{expand("%:~:.:h")}"
+    " Fix terminal title =================================================================================================
+    " autocmd VimEnter * let &t_EI .= "\<Esc>[0 q"
+    " autocmd VimEnter * let &t_SI = "\<Esc>]12;green\x7"
+    autocmd VimLeave * silent !echo -ne "\033]112\007"
+augroup END
+
diff --git a/plugin/max-splash.vim b/plugin/max-splash.vim
new file mode 100644
index 0000000..5282679
--- /dev/null
+++ b/plugin/max-splash.vim
@@ -0,0 +1,23 @@
+"=======================================================================================================================
+" MAX_SPLASH:
+" Shows recently used files from the current directory in a location list
+"=======================================================================================================================
+
+" moved after VimEnter of statusline, so that it does not get overwritten any
+" more
+if empty(argv())
+
+  " autocmd VimEnter * call setloclist(0, filter(map(copy(v:oldfiles), {_, p->{'filename': expand(get(split(p, "'"), 0))}}), { val -> echo val}))
+
+  " from the list of recent files: make absolute paths, filter out files not
+  " contained in cwd and finally filter out directories and non-files...
+  autocmd StdinReadPre * let s:std_in=1
+  autocmd VimEnter * if !exists("s:std_in") | call setloclist(0, [], 'r',
+        \ {
+        \   'title':'Recently used files in directory: '.getcwd(),
+        \   'items':map(filter(filter(
+        \               map(copy(v:oldfiles),
+        \                   {_, p->expand(p)}), 'v:val =~ "'.getcwd().'/"'), 'filereadable(v:val)'),
+        \               {_, p->{'filename': fnamemodify(p, ':.')}})
+        \ }) | lopen | only | setfiletype qf
+endif
diff --git a/plugin/nerdtree.vim b/plugin/nerdtree.vim
new file mode 100644
index 0000000..b9665fb
--- /dev/null
+++ b/plugin/nerdtree.vim
@@ -0,0 +1,25 @@
+augroup NERDTREE
+    " NERDTree: replaces NetRW, as long as it has so many bugs
+    let NERDTreeIgnore                = ['\.aux$', '\.o$']
+    let NERDTreeCascadeSingleChildDir = 0 | " I don't get how one can use <m> to create files in that included directory
+    let NERDTreeChDirMode             = 0
+    let NERDTreeHiddenFirst           = 1
+    let NERDTreeMinimalUI             = 1
+    let NERDTreeShowBookmarks         = 1 | " show bookmarks by default (when opening for the first time)
+    let NERDTreeWinSize               = 40
+    let NERDTreeQuitOnOpen            = 1
+
+    " depending on if NERDTree has the focus:
+    nnoremap <expr>
+                \ <leader><leader>
+                \ bufwinnr("%")==g:NERDTree.GetWinNum() ? ':NERDTreeClose<CR>' : ':NERDTreeFind<CR>'
+    nnoremap <expr>
+                \ <F2>
+                \ bufwinnr("%")==g:NERDTree.GetWinNum() ? '<C-W><C-W>' : ':N<CR>'
+
+    nnoremap <expr>
+                \ <F3>
+                \ bufwinnr("%")==g:NERDTree.GetWinNum() ? '<C-W><C-W>' : ':n<CR>'
+
+    packadd nerdtree
+augroup END
diff --git a/plugin/netrw.vim b/plugin/netrw.vim
new file mode 100644
index 0000000..d9029cc
--- /dev/null
+++ b/plugin/netrw.vim
@@ -0,0 +1,16 @@
+augroup NETRW
+    " Deprecated with this configuration, but still useful when deactivating some Plugins
+    " NETRW: obsolete with NERDTree
+    let g:netrw_alto          = 0       | " open files on the right
+    let g:netrw_altv          = 1       | " open files on the right
+    let g:netrw_banner        = 0       | " display help messages?
+    let g:netrw_browse_split  = 4       | " 4=open in previous window
+    let g:netrw_fastbrowse    = 2       | " manually refresh direcory list (avoids display errors)
+    let g:netrw_hide          = 1       | " show not-hidden files only
+    let g:netrw_keepdir       = 0
+    let g:netrw_list_hide     = '^\..*' | " Explore mode: hide files starting with dot
+    let g:netrw_liststyle     = 3       | " 3=tree
+    let g:netrw_preview       = 0       | "
+    let g:netrw_winsize       = 20      | " window size in percent
+    let s:treedepthstring     = "│ "
+augroup END
diff --git a/plugin/signify.vim b/plugin/signify.vim
new file mode 100644
index 0000000..2ab41fe
--- /dev/null
+++ b/plugin/signify.vim
@@ -0,0 +1,35 @@
+augroup SIGNIFY
+  " displays file changes in sign column
+
+  let @l = ":let g:signify_vcs_cmds={'git': 'git diff --no-color --no-ext-diff -U0 HEAD^ -- %f'}|:SignifyRefresh"
+
+  " use signify only with git (improves speed when loading buffers, see :h signify) 
+  let g:signify_vcs_list               = [ 'git' ]
+
+  let g:signify_cursorhold_insert      = 0
+  let g:signify_cursorhold_normal      = 0
+  let g:signify_update_on_bufenter     = 0
+  let g:signify_update_on_focusgained  = 0
+  let g:signify_sign_show_count        = 0
+
+  if has("multi_byte") && (&enc == 'utf-8' || &enc == 'utf-16' || &enc == 'ucs-4')
+    let g:signify_sign_add               = '➕'
+    let g:signify_sign_delete            = '➖'
+    let g:signify_sign_delete_first_line = '➖'
+    let g:signify_sign_change            = '❇️'
+    let g:signify_sign_changedelete      = '❇️'
+  endif
+
+  function! SignifyColorScheme()
+    highlight! SignifySignAdd  ctermbg=NONE
+    highlight! link            SignifySignAdd              SignColumn
+    highlight! link            SignifySignChange           SignColumn
+    highlight! link            SignifySignDelete           SignColumn
+    highlight! link            SignifySignChangeDelete     SignColumn
+    highlight! link            SignifySignDeleteFirstLine  SignColumn
+  endfunction
+
+  packadd vim-signify
+
+  autocmd VimEnter,ColorScheme * call SignifyColorScheme()
+augroup END
diff --git a/plugin/snippets.vim b/plugin/snippets.vim
new file mode 100644
index 0000000..dcf265b
--- /dev/null
+++ b/plugin/snippets.vim
@@ -0,0 +1,12 @@
+
+augroup ULTISNIPS
+    if has("python") || has('python3')
+        let g:UltiSnipsExpandTrigger       = '<Tab>'|    " expands the snippet, be careful not to use <tab> elsewhere (ycm uses it by default, but it has been deactivated by g:ycm_key_list_select_completion)
+        let g:UltiSnipsJumpForwardTrigger  = '<Tab>'|
+        let g:UltiSnipsJumpBackwardTrigger = '<S-Tab>'|
+
+        packadd vim-snippets
+        packadd ultisnips
+    endif
+augroup END
+
diff --git a/plugin/statusline.vim b/plugin/statusline.vim
new file mode 100644
index 0000000..98fc4a9
--- /dev/null
+++ b/plugin/statusline.vim
@@ -0,0 +1,125 @@
+augroup MAX_FANCYLINE
+    set noshowmode    | " mode will be shown twice, in lightline and below, so we want to deactivate one
+    set laststatus=2  | " required by AirLine and Lightline, without status line does not appear until a window split
+
+    let g:status_sym_start     = ''
+    let g:status_sym_end       = ''
+    let g:status_sym_sep_start = ''
+    let g:status_sym_sep_end   = ''
+    let g:symbol_branch        = ''
+
+    if &term == "linux"
+        let g:symbol_branch      = ''
+
+        let g:group_active       = "StatusLineTerm"
+        let g:group_inactive     = "StatusLineTermNC"
+        let g:group_tabline      = "StatusLineTerm"
+    else
+        let g:group_active       = "StatusLine"
+        let g:group_inactive     = "StatusLineNC"
+        let g:group_tabline      = "TabLine"
+    endif
+
+    " this function reverts foreground color and background color of a given
+    " highlight group and returns the name of a newly created _invert group
+    function! CreateInvertGroup(highlight_group)
+        if(synIDattr(hlID(a:highlight_group), "reverse")==1)
+            let w:color=synIDattr(hlID(a:highlight_group), "fg#")
+        else
+            let w:color=synIDattr(hlID(a:highlight_group), "bg#")
+        endif
+
+        let l:retval=a:highlight_group.'_invert'
+        if(exists('w:color') && w:color == '')
+            let w:color = 'NONE'
+        endif
+        silent! exec 'highlight '.retval.' gui=NONE guifg='.w:color.' cterm=NONE ctermfg='.w:color
+        return l:retval
+    endfunction
+
+    function! UpdateStatus(highlight_group)
+        let l:invert_group = CreateInvertGroup(a:highlight_group)
+        let l:mode = get({
+                    \  'n'      : 'normal',
+                    \  'i'      : 'insert',
+                    \  'R'      : 'replace',
+                    \  'v'      : 'visual',
+                    \  "V"      : 'visual line',
+                    \  "\<C-V>" : 'visual block',
+                    \  'c'      : 'command',
+                    \  's'      : 'select',
+                    \  'S'      : 'select line',
+                    \  "\<C-s>" : 'select block',
+                    \  't'      : 'terminal'
+                    \ }, mode(), mode())
+        return ''
+                    \ ."%#StatusLineHighlight#"
+                    \ ."%#".a:highlight_group."#"
+                    \ ."%(%w%h%q%)".' '.l:mode.' '.g:status_sym_sep_start.' '
+                    \ ."%{(argc()>0\ ?\ argidx()+1.':'.argc().' '.g:status_sym_sep_start.' '\ :\ '')}"
+                    \ ."%{winbufnr(0).' '.g:status_sym_sep_start}"
+                    \ ."%{(&readonly\ ?\ '\ \ 🔒'\ :\ '')}"
+                    \ ."%{(&modified\ ?\ '\ \ '.nr2char(0xF0C7).'\ '\ :\ '')\ }"
+                    \ ."%{(haslocaldir() ?\ fnamemodify(getcwd(),\ ':.').' '.nr2char(0xe0b1)\ \:\ '')}\ "
+                    \ ."%{(&buftype\ ==\ \"terminal\"\ ?\ has('nvim')?b:term_title:expand(&titlestring)\ :\ substitute(expand('%:p'),\ '^'.getcwd(-1).'/*',\ '',\ ''))\ }"
+                    \ ."%1(%)"
+                    \ ."%#".l:invert_group."#"
+                    \ .g:status_sym_end
+                    \ .''
+                    \ ."%="
+                    \ .''
+                    \ ."%#".l:invert_group."#"
+                    \ .g:status_sym_start
+                    \ ."%#".a:highlight_group."#"
+                    \ ."%1(%)"
+                    \ ."%{(&filetype\ !=\ ''\ ?\ &filetype\ :\ &buftype)}"
+                    \ ."%(\ %{g:status_sym_sep_end}\ %)"
+                    \ ."%{(&spell\ ?\ &spelllang.' '.g:status_sym_sep_end\ :\ '')}"
+                    \ ."%{(&fileencoding\ !=\ ''\ ?\ &fileencoding.' '.g:status_sym_sep_end.' '\ :\ '')}"
+                    \ ."%{(&fileformat\ !=\ ''\ ?\ ' '.&fileformat.' '\ :\ '')}"
+                    \ .g:status_sym_sep_end.' '
+                    \ ."%4l:%-3c"
+                    \ .g:status_sym_sep_end.' '
+                    \ ."%-3p%%"
+    endfunction
+
+    function! UpdateTabline(highlight_group)
+        let l:invert_group = CreateInvertGroup(a:highlight_group)
+        return ''
+                    \ ."%#".a:highlight_group."#"
+                    \ ."%3( \ %)\ "
+                    \ ."%{getcwd(-1)}\ "
+                    \ .g:status_sym_sep_start.' '
+                    \ ."%(\ ".g:symbol_branch."\ %{fugitive#head()}\ %)"
+                    \ ."%#".l:invert_group."#"
+                    \ .g:status_sym_end
+                    \ .''
+                    \ ."%="
+                    \ .''
+                    \ ."%#".l:invert_group."#"
+                    \ .g:status_sym_start
+                    \ ."%#".a:highlight_group."#"
+                    \ ."%3(\ %)"
+                    \ ."%(%{v:servername}\ %{v:this_session}%)"
+                    \ .g:status_sym_sep_end.' '
+                    \ ."%(\ \ %{tabpagenr()}/%{tabpagenr('$')}\ %)"
+                    \ ."%##"
+                    \ ."" " end
+    endfunction
+
+    function! ApplyColorScheme()
+        " set termguicolors | " When on, uses highlight-guifg and highlight-guibg attributes in the terminal (=24bit color) incompatible with nvim
+        " set t_ut=
+        " set up statusline, global and current window individually
+        set statusline=%!UpdateStatus(g:group_inactive)
+        setlocal statusline=%!UpdateStatus(g:group_active)
+        " set up the tabline (match colors)
+        set tabline=%!UpdateTabline(g:group_tabline)
+    endfunction
+    " apply colors from the loaded colorscheme...
+    " when changing the colorscheme also apply new colors to the statusbar...
+    autocmd VimEnter,ColorScheme  * call ApplyColorScheme()
+
+    autocmd WinEnter    * setlocal statusline=%!UpdateStatus(g:group_active)
+    autocmd WinLeave    * setlocal statusline<
+augroup END " MAX_FANCYLINE
diff --git a/plugin/tagbar.vim b/plugin/tagbar.vim
new file mode 100644
index 0000000..2758f20
--- /dev/null
+++ b/plugin/tagbar.vim
@@ -0,0 +1,10 @@
+augroup TAGBAR
+    let g:tagbar_autoclose   = 0
+    let g:tagbar_autofocus   = 1
+    let g:tagbar_autoshowtag = 0
+    let g:tagbar_compact     = 1
+    let g:tagbar_indent      = 0
+    let g:tagbar_foldlevel   = 99
+
+    packadd tagbar
+augroup END
diff --git a/plugin/terminal.vim b/plugin/terminal.vim
new file mode 100644
index 0000000..c8f02fd
--- /dev/null
+++ b/plugin/terminal.vim
@@ -0,0 +1,19 @@
+augroup TERMINAL
+    " Vim 8 has a terminal command...
+    if has('terminal')
+        " use default ESC key to leave insert mode in the internal terminal emulator
+        tnoremap <Esc> <C-W>N
+        " make terminal windows hidden by default (copied from :help terminal)
+        autocmd BufWinEnter * if &buftype == 'terminal' | setlocal bufhidden=hide | endif
+    endif
+
+    " NEOVIM_incompatible:
+    if has('nvim') " Neovim?
+        autocmd TermOpen term://* set nobuflisted
+        " use default ESC key to leave insert mode in the internal terminal emulator
+        tnoremap <Esc> <C-\><C-n>
+
+        menu &UI.&Open\ in\ Serversession
+                    \ :execute ':!nvr --servername /tmp/nvimsocket --remote % +'.line('.')<CR>:stopinsert<CR>:set readonly<CR>
+    endif
+augroup END
-- 
cgit v1.2.3