From d434b763897259bab513799951b072a7b4cf0d00 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Thu, 19 Jul 2018 22:07:40 +1200 Subject: Update and rename toggle_option_flags.vim plugin --- .gitmodules | 6 +++--- vim/bundle/toggle_flags | 1 + vim/bundle/toggle_option_flags | 1 - vim/vimrc | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) create mode 160000 vim/bundle/toggle_flags delete mode 160000 vim/bundle/toggle_option_flags diff --git a/.gitmodules b/.gitmodules index 093f1fc4..c7d2d0bd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -35,9 +35,9 @@ [submodule "vim/bundle/strip_trailing_whitespace"] path = vim/bundle/strip_trailing_whitespace url = https://sanctum.geek.nz/code/vim-strip-trailing-whitespace.git -[submodule "vim/bundle/toggle_option_flags"] - path = vim/bundle/toggle_option_flags - url = https://sanctum.geek.nz/code/vim-toggle-option-flags.git +[submodule "vim/bundle/toggle_flags"] + path = vim/bundle/toggle_flags + url = https://sanctum.geek.nz/code/vim-toggle-flags.git [submodule "vim/bundle/uncap_ex"] path = vim/bundle/uncap_ex url = https://sanctum.geek.nz/code/vim-uncap-ex.git diff --git a/vim/bundle/toggle_flags b/vim/bundle/toggle_flags new file mode 160000 index 00000000..22f39d04 --- /dev/null +++ b/vim/bundle/toggle_flags @@ -0,0 +1 @@ +Subproject commit 22f39d04ab09e2fa10f4c9482f5735a1c928d7e8 diff --git a/vim/bundle/toggle_option_flags b/vim/bundle/toggle_option_flags deleted file mode 160000 index 4c6224a1..00000000 --- a/vim/bundle/toggle_option_flags +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4c6224a138eb5a479a462df3f384266bd9cfeffb diff --git a/vim/vimrc b/vim/vimrc index ec997e02..9b261986 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -252,7 +252,7 @@ nmap ] (PutBlankLinesBelow) " Normal leader maps; use not for vim-tiny " \a toggles 'formatoptions' 'a' flag using a plugin -nnoremap a :ToggleOptionFlagLocal formatoptions a +nnoremap a :ToggleFlagLocal formatoptions a " \b toggles copy-pasteable linebreak settings nmap b (CopyLinebreakToggle) " \c toggles 'cursorline' -- cgit v1.2.3 From 2d7b63c419cd195b7b2313fee0ef0ca970b8f6a9 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Thu, 19 Jul 2018 23:48:44 +1200 Subject: Apply toggle_flag.vim hotfix --- vim/bundle/toggle_flags | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/bundle/toggle_flags b/vim/bundle/toggle_flags index 22f39d04..68624dcd 160000 --- a/vim/bundle/toggle_flags +++ b/vim/bundle/toggle_flags @@ -1 +1 @@ -Subproject commit 22f39d04ab09e2fa10f4c9482f5735a1c928d7e8 +Subproject commit 68624dcd8622a378dca46d1437af336157b8810c -- cgit v1.2.3 From 46a72313f81a3ad6bd7c4ea98d9c7d790eff8932 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Thu, 19 Jul 2018 23:56:20 +1200 Subject: Move 'encoding' .vimrc setting alphabetically --- vim/vimrc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/vim/vimrc b/vim/vimrc index 9b261986..297fd078 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -80,11 +80,6 @@ else set display=lastline " Just let it run off the screen if not endif -" If $LANG isn't set and 'encoding' is the default, use UTF-8 -if has('multi_byte') && !exists('$LANG') && &encoding ==# 'latin1' - set encoding=utf-8 -endif - " Don't wait for a key after Escape in insert mode if exists('+esckeys') " Not in Neovim set noesckeys @@ -171,6 +166,11 @@ if has('mksession') set sessionoptions-=options endif +" If $LANG isn't set and 'encoding' is the default, use UTF-8 +if has('multi_byte') && !exists('$LANG') && &encoding ==# 'latin1' + set encoding=utf-8 +endif + " Persistent undo settings if has('persistent_undo') -- cgit v1.2.3 From c6343abeb5a2cd4717aa777cf295c7e8eec5fad0 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Fri, 20 Jul 2018 20:38:09 +1200 Subject: Upgrade, reconfig strip_trailing_whitespace plugin --- vim/bundle/strip_trailing_whitespace | 2 +- vim/vimrc | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/vim/bundle/strip_trailing_whitespace b/vim/bundle/strip_trailing_whitespace index e689a609..3ecc30fe 160000 --- a/vim/bundle/strip_trailing_whitespace +++ b/vim/bundle/strip_trailing_whitespace @@ -1 +1 @@ -Subproject commit e689a60912a1832f167bdc88cf08cbba2a9ae7e1 +Subproject commit 3ecc30fe80b32003414d2647efb17e89c27c6aae diff --git a/vim/vimrc b/vim/vimrc index 297fd078..093023c6 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -314,7 +314,10 @@ nnoremap V :let b: t: w: " \w toggles wrapping nnoremap w :setlocal wrap! wrap? " \x strips trailing whitespace via a custom plugin -nmap x (StripTrailingWhitespace) +nmap x :StripTrailingWhitespace +if v:version >= 700 + xmap x :StripTrailingWhitespace +endif " \y shows all registers nnoremap y :registers " \z sets NZ English spelling (compare \u) -- cgit v1.2.3 From 705d586b84dc3325383c3f4dbcfde5af5ba2a782 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Fri, 20 Jul 2018 20:43:20 +1200 Subject: Remove any range from \e mapping --- vim/vimrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/vimrc b/vim/vimrc index 093023c6..6ec2e977 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -264,7 +264,7 @@ nnoremap d :read !date " \D inserts the UTC date (POSIX date) nnoremap D :read !date -u " \e forces a buffer to be editable -nnoremap e :setlocal modifiable noreadonly +nnoremap e :setlocal modifiable noreadonly " \f shows the current 'formatoptions' at a glance nnoremap f :setlocal formatoptions? " \g changes directory to the current file's location -- cgit v1.2.3 From d7574df2c1f99d277875e550766417cdfa1b3512 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Fri, 20 Jul 2018 20:44:00 +1200 Subject: Bump VERSION --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index a5e11840..ac66eb83 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -tejr dotfiles v1.35.0 -Wed Jul 18 22:47:49 UTC 2018 +tejr dotfiles v1.36.0 +Fri Jul 20 08:43:54 UTC 2018 -- cgit v1.2.3