aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-08-04 21:13:41 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-08-04 21:13:41 +1200
commitc014449d3205142d00d5aea53d1e70d108c2b85b (patch)
tree313e5f78a671bf17f1ab4078977137329dd2451e
parent9553b7910a348f9d3c774a37552dda8caf88b97f (diff)
parent126cfc0bd7bc694ad4eab2b8bf6e3c4a14e18c45 (diff)
downloaddotfiles-c014449d3205142d00d5aea53d1e70d108c2b85b.tar.gz
dotfiles-c014449d3205142d00d5aea53d1e70d108c2b85b.zip
Merge branch 'release/v1.44.0'v1.44.0
* release/v1.44.0: Bump VERSION Update cursorline_current.vim plugin to hotfix Spin cursorline_current.vim out into plugin Make insert-mode cursorline ducking configurable Remove conditionals for 'cursorline' hooks Remove illegal :wincmd range prefix Require Vim 7 for cursorline_current.vim Add cursorline_current.vim plugin Correct comments on Vim maps to show mappings Correct start-of-line jumps in Vim line exec maps
-rw-r--r--.gitmodules3
-rw-r--r--VERSION4
m---------vim/bundle/cursorline_current0
m---------vim/bundle/sahara0
-rw-r--r--vim/vimrc15
5 files changed, 15 insertions, 7 deletions
diff --git a/.gitmodules b/.gitmodules
index 46179fab..a695d790 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -11,6 +11,9 @@
[submodule "vim/bundle/copy_linebreak"]
path = vim/bundle/copy_linebreak
url = https://sanctum.geek.nz/code/vim-copy-linebreak.git
+[submodule "vim/bundle/cursorline_current"]
+ path = vim/bundle/cursorline_current
+ url = https://sanctum.geek.nz/code/vim-cursorline-current.git
[submodule "vim/bundle/digraph_search"]
path = vim/bundle/digraph_search
url = https://sanctum.geek.nz/code/vim-digraph-search.git
diff --git a/VERSION b/VERSION
index 6fcbf78d..a43eacc3 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v1.43.0
-Sat Aug 4 01:13:45 UTC 2018
+tejr dotfiles v1.44.0
+Sat Aug 4 09:13:25 UTC 2018
diff --git a/vim/bundle/cursorline_current b/vim/bundle/cursorline_current
new file mode 160000
+Subproject 70eb3eaaecfce486ce6df4a141d3d4d1bec30e0
diff --git a/vim/bundle/sahara b/vim/bundle/sahara
-Subproject 6818d1555a9d733f33f805e91b7147cdfddde04
+Subproject 5b24c60103d7ee056b88f1c0cc799d6479d75ec
diff --git a/vim/vimrc b/vim/vimrc
index 445e0bbb..6b181fa7 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -61,6 +61,11 @@ set comments=
" Give me a prompt instead of just rejecting risky :write, :saveas
set confirm
+" Only turn on 'cursorline' if my colorscheme loaded
+if exists('g:colors_name') && g:colors_name ==# 'sahara'
+ set cursorline
+endif
+
" Try to keep swapfiles in one system-appropriate dir
set directory^=~/.vim/cache/swap//,~/vimfiles/cache/swap//
@@ -256,9 +261,9 @@ nnoremap <Bslash>j :<C-U>buffers<CR>:buffer<Space>
nnoremap <Bslash>k :<C-U>marks<CR>
" \l toggles showing tab, end-of-line, and trailing whitespace
nnoremap <Bslash>l :<C-U>setlocal list! list?<CR>
-" \m shows all maps
+" \m shows normal maps
nnoremap <Bslash>m :<C-U>map<CR>
-" \M shows buffer-local maps
+" \M shows buffer-local normal maps
nnoremap <Bslash>M :<C-U>map <buffer><CR>
" \n toggles line numbers
nnoremap <Bslash>n :<C-U>setlocal number! number?<CR>
@@ -324,11 +329,11 @@ nnoremap <Bslash><Insert> :<C-U>enew<CR>
" Execution mappings; each of these clobbers register z
" \@ executes line in normal mode
-nnoremap <Bslash>@ g^"zyg_@z
+nnoremap <Bslash>@ ^"zyg_@z
" \: executes line in command mode
-nnoremap <Bslash>: g^"zyg_:<C-R>z<CR>
+nnoremap <Bslash>: ^"zyg_:<C-R>z<CR>
" \! executes line with 'shell'
-nnoremap <Bslash>! g^"zyg_:!<C-R>z<CR>
+nnoremap <Bslash>! ^"zyg_:!<C-R>z<CR>
" If we're running NeoVim, source some extra configuration
if has('nvim')