aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-07-23 17:12:27 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-07-23 17:12:27 +1200
commit3778c6a79469b020cebf516c5753b139310deab1 (patch)
tree91489fc21855edfdb7a91936ea6fdafe3d3ff98f
parentcc8cc00508c8fd16c7a33307ee5e183909476e1d (diff)
parent629e5303ef3a57be7f576513eaf1eca46c474b82 (diff)
downloaddotfiles-3778c6a79469b020cebf516c5753b139310deab1.tar.gz
Merge branch 'release/v1.38.0'v1.38.0
* release/v1.38.0: Bump VERSION Remove now-unneeded :lwindow from \. map Add autocmds to always pop open quickfix/loclist Update TABS.md instructions Expand tabs in TABS.md Inline 'undodir' assignment Remove superfluous [t,]t maps Allow count prefixes for [,] maps Blank 'ttymouse' in Vim
-rw-r--r--TABS.md21
-rw-r--r--VERSION4
-rw-r--r--vim/vimrc38
3 files changed, 34 insertions, 29 deletions
diff --git a/TABS.md b/TABS.md
index 46c4b585..e304fdb1 100644
--- a/TABS.md
+++ b/TABS.md
@@ -4,24 +4,23 @@ Spaces to tabs
If you prefer tabs to spaces, the following recipe seems to convert everything
pretty nicely:
- $ find . -name .git -prune -o -name vim -prune -o -type f \
- -exec sh -c \
- 'for f;do unexpand -t4 "$f">"$f".tmp;mv "$f" "$f".tmp;done' \
- _ {} +
+ $ find . -name .git -prune -o -name vim -prune -o -type f \
+ -exec sh -c \
+ 'for f;do unexpand -t4 "$f">"$f".tmp;mv "$f" "$f".tmp;done' \
+ _ {} +
- $ find vim -name bundle -prune -o -type f \
- -exec sh -c \
- 'for f;do unexpand -t2 "$f">"$f".tmp;mv "$f" "$f".tmp;done' \
- _ {} +
+ $ find vim -name bundle -prune -o -type f \
+ -exec sh -c \
+ 'for f;do unexpand -t2 "$f">"$f".tmp;mv "$f" "$f".tmp;done' \
+ _ {} +
If you have GNU unexpand(1) and can add `--first-only` to each of those calls,
the results seem perfect.
-You can configure Vim to accommodate this by removing the settings in
-vim/config/indent.vim for:
+You can configure Vim to accommodate this by removing the settings in vim/vimrc
+for:
* `expandtab`
-* `shiftround`
* `shiftwidth`
* `smarttab`
* `softtabstop`
diff --git a/VERSION b/VERSION
index 2b5290b0..0824217f 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v1.37.2
-Sun Jul 22 22:14:02 UTC 2018
+tejr dotfiles v1.38.0
+Mon Jul 23 05:12:10 UTC 2018
diff --git a/vim/vimrc b/vim/vimrc
index a33508c6..747c9c67 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -137,6 +137,9 @@ set splitright
" Give me a bit longer to complete mappings
set timeoutlen=3000
+" No terminal mouse, even if we could
+set ttymouse=
+
" Wildmenu settings; see also plugin/wildignore.vim
set wildmenu " Use wildmenu
set wildmode=list:longest " Tab press completes and lists
@@ -156,10 +159,7 @@ endif
" Keep undo files, hopefully in a dedicated directory
if has('persistent_undo')
set undofile
- set undodir^=~/.vim/cache/undo//
- if has('win32') || has('win64')
- set undodir^=~/vimfiles/cache/undo//
- endif
+ set undodir^=~/.vim/cache/undo//,~/vimfiles/cache/undo//
endif
" Don't store any options or mappings in sessions
@@ -196,20 +196,17 @@ if exists(':xnoremap')
endif
" Cycle through argument list
-nnoremap [a :<C-U>previous<CR>
-nnoremap ]a :<C-U>next<CR>
+nnoremap [a :previous<CR>
+nnoremap ]a :next<CR>
" Cycle through buffers
-nnoremap [b :<C-U>bprevious<CR>
-nnoremap ]b :<C-U>bnext<CR>
+nnoremap [b :bprevious<CR>
+nnoremap ]b :bnext<CR>
" Cycle through quicklist/:helpgrep items
-nnoremap [c :<C-U>cprevious<CR>
-nnoremap ]c :<C-U>cnext<CR>
+nnoremap [c :cprevious<CR>
+nnoremap ]c :cnext<CR>
" Cycle through location list items
-nnoremap [l :<C-U>lprevious<CR>
-nnoremap ]l :<C-U>lnext<CR>
-" Cycle through tabs
-nnoremap [t :<C-U>tabprevious<CR>
-nnoremap ]t :<C-U>tabnext<CR>
+nnoremap [l :lprevious<CR>
+nnoremap ]l :lnext<CR>
" Insert blank lines around current line
nmap [<Space> <Plug>(PutBlankLinesAbove)
@@ -294,12 +291,21 @@ nnoremap <Bslash>= :<C-U>call vimrc#Anchor('1G=G')<CR>
" \+ runs the whole buffer through gq, preserving position
nnoremap <Bslash>+ :<C-U>call vimrc#Anchor('1GgqG')<CR>
" \. runs the configured make program into the location list
-nnoremap <Bslash>. :<C-U>lmake!<Bar>:lwindow<CR>
+nnoremap <Bslash>. :<C-U>lmake!<CR>
" \DEL deletes the current buffer
nnoremap <Bslash><Delete> :<C-U>bdelete<CR>
" \INS edits a new buffer
nnoremap <Bslash><Insert> :<C-U>enew<CR>
+" Always pop open quickfix and location lists when changed
+if exists('##QuickfixCmdPost')
+ augroup vimrc_quickfix
+ autocmd!
+ autocmd QuickfixCmdPost [^l]* cwindow
+ autocmd QuickfixCmdPost l* lwindow
+ augroup END
+endif
+
" Source any .vim files from ~/.vim/config
runtime! config/*.vim