aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-06-30 18:27:07 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-06-30 18:27:07 +1200
commit66792b48d9d196d78e08b056ebf6aa5b2eda4095 (patch)
tree742b5907045412a4842a13d5f0e1bbca359f3795
parentMerge branch 'release/v1.12.0' (diff)
parentBump VERSION (diff)
downloaddotfiles-1.13.0.tar.gz (sig)
dotfiles-1.13.0.zip
Merge branch 'release/v1.13.0'v1.13.0
* release/v1.13.0: Bump VERSION Add insert_timeout.vim plugin Add cmdwin_ctrlc Vim plugin Add variable existence guard to after/indent/vim Correct .vimrc incorrect option name Use :buffers instead of :ls in \j Vim map
-rw-r--r--.gitmodules6
-rw-r--r--VERSION4
-rw-r--r--vim/after/indent/vim.vim4
m---------vim/bundle/cmdwin_ctrlc0
m---------vim/bundle/insert_timeout0
-rw-r--r--vim/vimrc4
6 files changed, 13 insertions, 5 deletions
diff --git a/.gitmodules b/.gitmodules
index 0e03292a..14a95b64 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,6 +5,9 @@
[submodule "vim/bundle/big_file_options"]
path = vim/bundle/big_file_options
url = https://sanctum.geek.nz/code/vim-big-file-options.git
+[submodule "vim/bundle/cmdwin_ctrlc"]
+ path = vim/bundle/cmdwin_ctrlc
+ url = https://sanctum.geek.nz/code/vim-cmdwin-ctrlc.git
[submodule "vim/bundle/copy_linebreak"]
path = vim/bundle/copy_linebreak
url = https://sanctum.geek.nz/code/vim-copy-linebreak.git
@@ -14,6 +17,9 @@
[submodule "vim/bundle/insert_suspend_hlsearch"]
path = vim/bundle/insert_suspend_hlsearch
url = https://sanctum.geek.nz/code/vim-insert-suspend-hlsearch.git
+[submodule "vim/bundle/insert_timeout"]
+ path = vim/bundle/insert_timeout
+ url = https://sanctum.geek.nz/code/vim-insert-timeout.git
[submodule "vim/bundle/paste_open"]
path = vim/bundle/paste_open
url = https://sanctum.geek.nz/code/vim-paste-open.git
diff --git a/VERSION b/VERSION
index 7f478717..2f87ba17 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v1.12.0
-Fri Jun 29 13:46:46 UTC 2018
+tejr dotfiles v1.13.0
+Sat Jun 30 06:26:49 UTC 2018
diff --git a/vim/after/indent/vim.vim b/vim/after/indent/vim.vim
index e46aae54..4f2f42f8 100644
--- a/vim/after/indent/vim.vim
+++ b/vim/after/indent/vim.vim
@@ -1,6 +1,8 @@
" Observe VimL conventions for two-space indents
setlocal shiftwidth=2
-let b:undo_indent = b:undo_indent . '|setlocal shiftwidth<'
+if exists('b:undo_indent')
+ let b:undo_indent = b:undo_indent . '|setlocal shiftwidth<'
+endif
" If we need to set 'softtabstop' too, do it
if &softtabstop == -1
diff --git a/vim/bundle/cmdwin_ctrlc b/vim/bundle/cmdwin_ctrlc
new file mode 160000
+Subproject 47bda959acf6b9769b138e3eeb16e768ef415a2
diff --git a/vim/bundle/insert_timeout b/vim/bundle/insert_timeout
new file mode 160000
+Subproject c50cc11e48b33187b398f1e9c7f1b1125c7e1d6
diff --git a/vim/vimrc b/vim/vimrc
index 1067d09a..9fc842b5 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -116,7 +116,7 @@ if has('cmdline_info')
set ruler
endif
-" Clear default 'comment' value, let the filetype handle it
+" Clear default 'comments' value, let the filetype handle it
if has('comments')
set comments=
endif
@@ -255,7 +255,7 @@ nnoremap \h :<C-U>set hlsearch! hlsearch?<CR>
" \i toggles showing matches as I enter my pattern
nnoremap \i :<C-U>set incsearch! incsearch?<CR>
" \j jumps to buffers (jetpack)
-nnoremap \j :<C-U>ls<CR>:buffer<Space>
+nnoremap \j :<C-U>buffers<CR>:buffer<Space>
" \l toggles showing tab, end-of-line, and trailing whitespace
nnoremap \l :<C-U>set list! list?<CR>
" \n toggles line numbers