aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-07-24 15:13:08 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-07-24 15:13:08 +1200
commit25f79f23ee19663173f226f50f40f84502677883 (patch)
tree3087c178dd9069ef874c868ce4ec84e8c3e5fda0
parentMerge branch 'release/v1.39.0' (diff)
parentBump VERSION (diff)
downloaddotfiles-25f79f23ee19663173f226f50f40f84502677883.tar.gz
dotfiles-25f79f23ee19663173f226f50f40f84502677883.zip
Merge branch 'release/v1.40.0'v1.40.0
* release/v1.40.0: Bump VERSION Spin out colon_operator.vim plugin into submodule Improved colon_operator.vim plugin Add colon_operator.vim plugin Move quickfix auto-open into a little plugin file Bump up 'history' again Adjust 'indentkeys' in HTML indenting
-rw-r--r--.gitmodules3
-rw-r--r--VERSION4
-rw-r--r--vim/after/indent/html.vim4
m---------vim/bundle/colon_operator0
-rw-r--r--vim/plugin/quickfix_auto_open.vim22
-rw-r--r--vim/vimrc16
6 files changed, 36 insertions, 13 deletions
diff --git a/.gitmodules b/.gitmodules
index c7d2d0bd..972ca896 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,6 +5,9 @@
[submodule "vim/bundle/cmdwin_ctrlc"]
path = vim/bundle/cmdwin_ctrlc
url = https://sanctum.geek.nz/code/vim-cmdwin-ctrlc.git
+[submodule "vim/bundle/colon_operator"]
+ path = vim/bundle/colon_operator
+ url = https://sanctum.geek.nz/code/vim-colon-operator.git
[submodule "vim/bundle/copy_linebreak"]
path = vim/bundle/copy_linebreak
url = https://sanctum.geek.nz/code/vim-copy-linebreak.git
diff --git a/VERSION b/VERSION
index c43e3c76..d84a24f6 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v1.39.0
-Mon Jul 23 10:18:52 UTC 2018
+tejr dotfiles v1.40.0
+Tue Jul 24 03:12:33 UTC 2018
diff --git a/vim/after/indent/html.vim b/vim/after/indent/html.vim
new file mode 100644
index 00000000..6eae00ac
--- /dev/null
+++ b/vim/after/indent/html.vim
@@ -0,0 +1,4 @@
+" Don't re-indent lines on right-angle-bracket or enter
+setlocal indentkeys-=<>>
+setlocal indentkeys-=<Return>
+let b:undo_ftplugin .= '|setlocal indentkeys<'
diff --git a/vim/bundle/colon_operator b/vim/bundle/colon_operator
new file mode 160000
+Subproject 5525627dd9727f2ee713e3a06145a145410bcd7
diff --git a/vim/plugin/quickfix_auto_open.vim b/vim/plugin/quickfix_auto_open.vim
new file mode 100644
index 00000000..e2f111fb
--- /dev/null
+++ b/vim/plugin/quickfix_auto_open.vim
@@ -0,0 +1,22 @@
+"
+" quickfix_auto_open.vim: Always pop open the quickfix list or location list
+" when they're changed. Dispassionately stolen from romainl's minivimrc.
+"
+" Author: Tom Ryder <tom@sanctum.geek.nz>
+" License: Same as Vim itself
+"
+if exists('g:loaded_quickfix_auto_open') || &compatible
+ finish
+endif
+if !exists('##QuickfixCmdPost') || !exists('##VimEnter')
+ finish
+endif
+let g:loaded_quickfix_auto_open = 1
+
+" Always pop open quickfix and location lists when changed
+augroup quickfix_auto_open
+ autocmd!
+ autocmd QuickfixCmdPost [^l]* cwindow
+ autocmd QuickfixCmdPost l* lwindow
+ autocmd VimEnter * cwindow
+augroup END
diff --git a/vim/vimrc b/vim/vimrc
index 47422f87..3dadba76 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -80,8 +80,8 @@ endif
" Allow buffers to have changes without being displayed
set hidden
-" Keep more command and search history
-set history=500
+" Keep much more command and search history
+set history=2000
" Highlight completed searches; clear on reload
set hlsearch
@@ -195,6 +195,9 @@ if exists(':xnoremap')
xnoremap <silent> & :&&<CR>
endif
+" Map g: as a 'colon operator'
+nmap g: <Plug>(ColonOperator)
+
" Cycle through argument list
nnoremap [a :previous<CR>
nnoremap ]a :next<CR>
@@ -300,14 +303,5 @@ nnoremap <Bslash><Delete> :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