aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-12-18 16:02:51 +1300
committerTom Ryder <tom@sanctum.geek.nz>2019-12-18 16:02:51 +1300
commit80f19a0d2beb72fd949fca71834e91cce102616e (patch)
treea6e6032582a96ce803f3796cdbf47f7509252f25
parentMerge branch 'release/v8.4.0' (diff)
parentBump VERSION (diff)
downloaddotfiles-80f19a0d2beb72fd949fca71834e91cce102616e.tar.gz
dotfiles-80f19a0d2beb72fd949fca71834e91cce102616e.zip
Merge branch 'release/v8.5.0'v8.5.0
* release/v8.5.0: Update change date on vimrc Set 'cursorline' for all windows on colors change Specify some interdependencies in Vim config Simplify 'cursorline' switching
-rw-r--r--Makefile4
-rw-r--r--VERSION4
-rw-r--r--vim/autoload/colorscheme.vim14
-rw-r--r--vim/vimrc2
4 files changed, 13 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index 814cd41a..bdd6b1d4 100644
--- a/Makefile
+++ b/Makefile
@@ -554,7 +554,7 @@ install-vim-after: install-vim-after-ftplugin \
install-vim-after-plugin \
install-vim-after-syntax
-install-vim-after-ftplugin:
+install-vim-after-ftplugin: install-vim-compiler
mkdir -p $(VIMDIR)/after/ftplugin
cp -p -- vim/after/ftplugin/*.vim $(VIMDIR)/after/ftplugin
@@ -595,7 +595,7 @@ install-vim-compiler:
mkdir -p -- $(VIMDIR)/compiler
cp -p -- vim/compiler/*.vim $(VIMDIR)/compiler
-install-vim-config: install-vim-cache
+install-vim-config: install-vim-autoload install-vim-cache
cp -p -- vim/vimrc.stub $(HOME)/.vimrc
cp -p -- vim/vimrc $(VIMRC)
diff --git a/VERSION b/VERSION
index 57c7ea8b..a2dc20d7 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v8.4.0
-Sun, 15 Dec 2019 04:23:07 +0000
+tejr dotfiles v8.5.0
+Wed, 18 Dec 2019 03:02:49 +0000
diff --git a/vim/autoload/colorscheme.vim b/vim/autoload/colorscheme.vim
index 9ee9f24d..591550fd 100644
--- a/vim/autoload/colorscheme.vim
+++ b/vim/autoload/colorscheme.vim
@@ -1,8 +1,10 @@
-" Reset colorscheme based on current colorscheme name
+" Reset window-global value for 'cursorline' based on current colorscheme name
function! colorscheme#UpdateCursorline(colors_name, list) abort
- if index(a:list, a:colors_name) >= 0
- set cursorline
- else
- set nocursorline
- endif
+ let l:tab = tabpagenr()
+ let l:win = winnr()
+ tabdo windo let &g:cursorline = index(a:list, a:colors_name) >= 0
+ \| silent doautocmd WinEnter,WinLeave
+ execute l:tab . 'tabnext'
+ execute l:win . 'wincmd w'
+ \| silent doautocmd WinEnter
endfunction
diff --git a/vim/vimrc b/vim/vimrc
index 3eb1dbbe..91424fd1 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -2,7 +2,7 @@
" Tom Ryder (tejr)’s Literate Vimrc
" ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
"
-" Last updated: Tue, 09 Jul 2019 13:11:16 +1200
+" Last updated: Wed, 18 Dec 2019 16:02:05 +1300
"
" │ And I was lifted up in heart, and thought
" │ Of all my late-shown prowess in the lists,