From 4b324646269215b47b61f4e6f1b9fcee3edd72bc Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 27 Jun 2018 12:52:18 +1200 Subject: Restore 'esckeys' option existence check Now I remember: Neovim doesn't have it. --- vim/vimrc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/vim/vimrc b/vim/vimrc index 72106b0a..7cd795a5 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -64,8 +64,10 @@ else set display=lastline " Just let it run off the screen if not endif -" Don't wait for a key after Escape in insert mode -set noesckeys +" Don't wait for a key after Escape in insert mode (not in Neovim) +if exists('+esckeys') + set noesckeys +endif " Delete comment leaders when joining lines, if supported if v:version > 703 || v:version == 703 && has('patch541') -- cgit v1.2.3 From 4d33458950a6a870d55ed24c89627cea83515800 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 27 Jun 2018 12:52:35 +1200 Subject: Don't load matchit.vim package if using Neovim --- vim/vimrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/vimrc b/vim/vimrc index 7cd795a5..df2219d4 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -279,7 +279,7 @@ nnoremap \z :setlocal spelllang=en_nz spelllang? if &loadplugins " Add packaged matchit.vim, if supported - if has('packages') + if has('packages') && !has('nvim') packadd! matchit endif -- cgit v1.2.3 From 55cd77a19a9a5d9ac91cd0c474ae6f4932030980 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 27 Jun 2018 12:54:23 +1200 Subject: Set 'laststatus' back to 1 in Neovim --- vim/vimrc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vim/vimrc b/vim/vimrc index df2219d4..15865b87 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -77,6 +77,11 @@ endif " Don't join lines with two spaces at the end of sentences set nojoinspaces +" Don't show a statusline if there's only one window +if has('nvim') " Neovim changed the default to 2 + set laststatus=1 +endif + " Don't redraw the screen during batch execution set lazyredraw -- cgit v1.2.3 From f930288f2771b26bb74ef6be65dde5081a800585 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 27 Jun 2018 12:58:25 +1200 Subject: Add `nbsp` flag to 'listchars' if supported --- vim/vimrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vim/vimrc b/vim/vimrc index 15865b87..cd3ca0da 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -90,6 +90,9 @@ set listchars+=extends:> " Unwrapped text to screen right set listchars+=precedes:< " Unwrapped text to screen left set listchars+=tab:>- " Tab characters, preserve width set listchars+=trail:_ " Trailing spaces +if v:version >= 700 + set listchars+=nbsp:+ " Non-breaking spaces +endif " Add angle brackets to pairs of matched characters set matchpairs+=<:> -- cgit v1.2.3 From c069da18ebc8b30f90115a62e32a1bc37eed0a11 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 27 Jun 2018 13:01:32 +1200 Subject: Adjust comment formatting --- vim/vimrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vim/vimrc b/vim/vimrc index cd3ca0da..1e2f8362 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -64,8 +64,8 @@ else set display=lastline " Just let it run off the screen if not endif -" Don't wait for a key after Escape in insert mode (not in Neovim) -if exists('+esckeys') +" Don't wait for a key after Escape in insert mode +if exists('+esckeys') " Not in Neovim set noesckeys endif -- cgit v1.2.3 From bd843173ad362c901521011dd95b5ef326d09867 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 27 Jun 2018 14:55:50 +1200 Subject: Move digraphs to more sensible location --- vim/vimrc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/vim/vimrc b/vim/vimrc index 1e2f8362..bbcb7db6 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -225,13 +225,6 @@ nnoremap ZA :wall! " ZW unconditionally writes current buffer nnoremap ZW :write! -" Custom digraphs -if has('digraphs') - digraph ./ 8230 " HORIZONTAL ELLIPSIS U+2026 - digraph %% 8984 " PLACE OF INTEREST SIGN U+2318 (Mac command key) - digraph 8: 9731 " SNOWMAN U+2603 -endif - " Normal mode leader mappings below; use a literal backslash rather than " on the non-plugin maps so that they work on vim-tiny @@ -283,6 +276,13 @@ nmap x StripTrailingWhitespace " \z sets NZ English spelling (compare \u) nnoremap \z :setlocal spelllang=en_nz spelllang? +" Custom digraphs +if has('digraphs') + digraph ./ 8230 " HORIZONTAL ELLIPSIS U+2026 + digraph %% 8984 " PLACE OF INTEREST SIGN U+2318 (Mac command key) + digraph 8: 9731 " SNOWMAN U+2603 +endif + " Settings for plugins if &loadplugins -- cgit v1.2.3 From 771e1999e65e326baadfe700fdc95e6709592455 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 27 Jun 2018 15:03:29 +1200 Subject: Revise .vimrc header comment --- vim/vimrc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vim/vimrc b/vim/vimrc index bbcb7db6..f48f31b6 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -1,8 +1,8 @@ " Tom Ryder (tejr)'s vimrc: " -" This file is not truly self-contained; it should run without errors on its -" own without the accompanying plugins to which it refers near the end of this -" file, but you'll get errors for some of the leader maps, for example. +" This file is not truly self-contained. It should run without errors on its +" own without the accompanying plugins to which it refers near its end, but +" you'll get errors for some of the leader maps. " Load filetype settings, plugins, and maps if has('autocmd') -- cgit v1.2.3 From 09dac3ea9c593a25f99934cf6e9d92ff8f5e7488 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 27 Jun 2018 22:28:27 +1200 Subject: Update two Vim plugins --- vim/bundle/copy_linebreak | 2 +- vim/bundle/strip_trailing_whitespace | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vim/bundle/copy_linebreak b/vim/bundle/copy_linebreak index f72e7711..f6fdbf1a 160000 --- a/vim/bundle/copy_linebreak +++ b/vim/bundle/copy_linebreak @@ -1 +1 @@ -Subproject commit f72e771130c47dedc2ec905b5b6a65ff224e97c2 +Subproject commit f6fdbf1afaae48b16a11744ba3f9ea1d3922ebb3 diff --git a/vim/bundle/strip_trailing_whitespace b/vim/bundle/strip_trailing_whitespace index fb3c25be..f434572d 160000 --- a/vim/bundle/strip_trailing_whitespace +++ b/vim/bundle/strip_trailing_whitespace @@ -1 +1 @@ -Subproject commit fb3c25becd1e4a565c4339b000b96ff519544dbd +Subproject commit f434572d4e99700d2dac5c5c0b78aac7601dd02a -- cgit v1.2.3 From 60af46618acc83bed88450bbbb3fbf9d6a1312d3 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Thu, 28 Jun 2018 11:03:27 +1200 Subject: Add and configure make_target.vim ftplugin --- .gitmodules | 3 +++ vim/bundle/make_target | 1 + vim/filemap.vim | 4 ++++ 3 files changed, 8 insertions(+) create mode 160000 vim/bundle/make_target diff --git a/.gitmodules b/.gitmodules index 46810091..88144a99 100644 --- a/.gitmodules +++ b/.gitmodules @@ -20,6 +20,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/make_target"] + path = vim/bundle/make_target + url = https://sanctum.geek.nz/code/vim-make-target.git [submodule "vim/bundle/markdown_autoformat"] path = vim/bundle/markdown_autoformat url = https://sanctum.geek.nz/code/vim-markdown-autoformat.git diff --git a/vim/bundle/make_target b/vim/bundle/make_target new file mode 160000 index 00000000..186591c1 --- /dev/null +++ b/vim/bundle/make_target @@ -0,0 +1 @@ +Subproject commit 186591c1201ffd4f204781a2989e0d7049786d41 diff --git a/vim/filemap.vim b/vim/filemap.vim index bbbf1955..d20a2037 100644 --- a/vim/filemap.vim +++ b/vim/filemap.vim @@ -25,6 +25,10 @@ augroup filetypemap \|nmap r HtmlUrlLink \|nmap t HtmlTidy + " Makefile: make target + autocmd FileType make + \ nmap m MakeTarget + " Perl: check, lint, and tidy autocmd FileType perl \ nmap c PerlCheck -- cgit v1.2.3 From be4b7281412e33369cffc9d9dc9e67edbef32cf2 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Thu, 28 Jun 2018 11:04:21 +1200 Subject: Rearrange .gitmodules a bit --- .gitmodules | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/.gitmodules b/.gitmodules index 88144a99..939eed66 100644 --- a/.gitmodules +++ b/.gitmodules @@ -11,21 +11,12 @@ [submodule "vim/bundle/copy_linebreak"] path = vim/bundle/copy_linebreak url = https://sanctum.geek.nz/code/vim-copy-linebreak.git -[submodule "vim/bundle/diff_prune"] - path = vim/bundle/diff_prune - url = https://sanctum.geek.nz/code/vim-diff-prune.git [submodule "vim/bundle/fixed_join"] path = vim/bundle/fixed_join url = https://sanctum.geek.nz/code/vim-fixed-join.git [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/make_target"] - path = vim/bundle/make_target - url = https://sanctum.geek.nz/code/vim-make-target.git -[submodule "vim/bundle/markdown_autoformat"] - path = vim/bundle/markdown_autoformat - url = https://sanctum.geek.nz/code/vim-markdown-autoformat.git [submodule "vim/bundle/paste_open"] path = vim/bundle/paste_open url = https://sanctum.geek.nz/code/vim-paste-open.git @@ -45,6 +36,17 @@ path = vim/bundle/uncap_ex url = https://sanctum.geek.nz/code/vim-uncap-ex.git +# My Vim filetype plugins +[submodule "vim/bundle/diff_prune"] + path = vim/bundle/diff_prune + url = https://sanctum.geek.nz/code/vim-diff-prune.git +[submodule "vim/bundle/make_target"] + path = vim/bundle/make_target + url = https://sanctum.geek.nz/code/vim-make-target.git +[submodule "vim/bundle/markdown_autoformat"] + path = vim/bundle/markdown_autoformat + url = https://sanctum.geek.nz/code/vim-markdown-autoformat.git + # My Vim colorschemes [submodule "vim/bundle/juvenile"] path = vim/bundle/juvenile -- cgit v1.2.3 From 725c8360164c45be1618eea9254ef724149a311f Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Thu, 28 Jun 2018 11:10:16 +1200 Subject: Bump VERSION --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index d63c5dc3..34fcce1f 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -tejr dotfiles v1.6.0 -Mon Jun 25 23:17:59 UTC 2018 +tejr dotfiles v1.7.0 +Wed Jun 27 23:10:12 UTC 2018 -- cgit v1.2.3