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(-) (limited to 'vim/vimrc') 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(-) (limited to 'vim/vimrc') 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(+) (limited to 'vim/vimrc') 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(+) (limited to 'vim/vimrc') 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(-) (limited to 'vim/vimrc') 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(-) (limited to 'vim/vimrc') 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(-) (limited to 'vim/vimrc') 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