some adjustments. i am finding git merge to be quite used now that i have two
parallel vimrc branches that share a lot of items.
this prevents it from showing in the statusline but unfortunately does not help
tmux get the clue that nothing changed, so it still alerts if I use F2/F3 to
switch tmux windows from within vim.
a less confusing (? maybe...) set of symbols to show in the diff field
changing default window size
This fixes the ability to click a lot somewhere else and have Vim remain in
insert mode while moving the cursor. I need it to either cancel insert mode or
keep the cursor in place, I prefer keeping the cursor in place to force me to
realize that i am in insert mode.
this changes the <CR> search behavior to be more lenient for matching (e.g. to
handle inappropriate word boundary filetype settings e.g. "." not being a word
separator in c/cpp for whatever reason)
this handles the thing i mentioned in the last commit message
i screwed up and left in the escaping backslash, i really don't know what i was
thinking when i got rid of it on the other side but didn't take care of this
one....
hmm
A js snippet file I found. Surprising, UltiSnips does not come with any.
Merge branch 'master' into lightweight

Conflicts:
	.vimrc