From fdaef12b5660593f2f788f16f2cba4ba20dc1521 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sat, 7 Jul 2018 18:08:05 +1200 Subject: Update Vim submodules --- vim/bundle/big_file_options | 2 +- vim/bundle/insert_suspend_hlsearch | 2 +- vim/bundle/markdown_autoformat | 2 +- vim/bundle/perl_version_bump | 2 +- vim/bundle/repeat | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/vim/bundle/big_file_options b/vim/bundle/big_file_options index d1d90c2c..10e23336 160000 --- a/vim/bundle/big_file_options +++ b/vim/bundle/big_file_options @@ -1 +1 @@ -Subproject commit d1d90c2c57676499c184660288502e2d6f166e89 +Subproject commit 10e23336ae2fb213f44affc8c8b37b0d9bc23056 diff --git a/vim/bundle/insert_suspend_hlsearch b/vim/bundle/insert_suspend_hlsearch index 6f117331..0b7cb75d 160000 --- a/vim/bundle/insert_suspend_hlsearch +++ b/vim/bundle/insert_suspend_hlsearch @@ -1 +1 @@ -Subproject commit 6f11733166454e1502a5832f8504826d7f411a8d +Subproject commit 0b7cb75d1bd8eac9e411ee344f78608122e69d6f diff --git a/vim/bundle/markdown_autoformat b/vim/bundle/markdown_autoformat index a1093557..aea3e815 160000 --- a/vim/bundle/markdown_autoformat +++ b/vim/bundle/markdown_autoformat @@ -1 +1 @@ -Subproject commit a109355774c8b1eccfa865156e557ee1734b3f00 +Subproject commit aea3e81506a08945dabc2766fe0a7b4d59d67fcc diff --git a/vim/bundle/perl_version_bump b/vim/bundle/perl_version_bump index 80c98e8b..3ea1890e 160000 --- a/vim/bundle/perl_version_bump +++ b/vim/bundle/perl_version_bump @@ -1 +1 @@ -Subproject commit 80c98e8b11832cf78f2fc3ee43599749be8ee6a6 +Subproject commit 3ea1890e49b064cb7e8fc1481fc70d5a4c919cca diff --git a/vim/bundle/repeat b/vim/bundle/repeat index 8106e142..43d2678f 160000 --- a/vim/bundle/repeat +++ b/vim/bundle/repeat @@ -1 +1 @@ -Subproject commit 8106e142dfdc278ff3eaaadd7b362ad7949d4357 +Subproject commit 43d2678fa59d068c815d8298331c195e850ff5a7 -- cgit v1.2.3 From d01186f94074dfc3b2b47934eed796bfbd0bec52 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 8 Jul 2018 00:48:33 +1200 Subject: Update strip_trailing_whitespace.vim plugin --- vim/bundle/strip_trailing_whitespace | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/bundle/strip_trailing_whitespace b/vim/bundle/strip_trailing_whitespace index ddf61eb5..1878ccd2 160000 --- a/vim/bundle/strip_trailing_whitespace +++ b/vim/bundle/strip_trailing_whitespace @@ -1 +1 @@ -Subproject commit ddf61eb54415c7cb308a2600b963f65790112149 +Subproject commit 1878ccd255b91ffabbe754d8b843e795fa95e034 -- cgit v1.2.3 From 84418af6963bb6ee888bd3ba54c91bed6f881dc8 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 8 Jul 2018 03:19:18 +1200 Subject: Map normal in Vim to Ctrl+B That is, make it the opposite of Space, which seems eminently sensible. --- vim/vimrc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim/vimrc b/vim/vimrc index 300fc3a5..0885fd98 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -177,10 +177,13 @@ imap InsertCancel nnoremap FixedJoin mzJ`z nmap J FixedJoin -" Remap normal/visual to scroll down a page +" Remap normal/visual to scroll down a page, and to scroll +" back up nnoremap +nnoremap if v:version >= 700 xnoremap + xnoremap endif " Remap normal/visual & to preserve substitution flags -- cgit v1.2.3 From c7e22dbf0a9797d729566215ac4350833004cb3f Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 8 Jul 2018 03:20:50 +1200 Subject: Bind leader maps for delete and insert --- vim/vimrc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vim/vimrc b/vim/vimrc index 0885fd98..e8439a58 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -277,5 +277,10 @@ nnoremap y :registers " \z sets NZ English spelling (compare \u) nnoremap z :setlocal spelllang=en_nz +" \DEL deletes the current buffer +nnoremap :bdelete +" \INS edits a new buffer +nnoremap :enew + " Source any .vim files from ~/.vim/config runtime! config/*.vim -- cgit v1.2.3 From d4e6f023413ed4b3d5a51e75547110c037e31591 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 8 Jul 2018 03:25:23 +1200 Subject: Switch to \\ (double-backslash) for local leader I decided I don't like comma as leader. Not sure why; it bugs me a little that it has a real and occasionally useful function that I'm overwriting, but it's just not sticking right either. Let's try \\ instead. --- vim/vimrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/vimrc b/vim/vimrc index e8439a58..d4989489 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -9,7 +9,7 @@ runtime system.vim " Load filetype settings, plugins, and maps if has('autocmd') - let g:maplocalleader = ',' + let g:maplocalleader = '\\' filetype plugin indent on endif -- cgit v1.2.3 From 9252e6ffc5f1c80f45ac8d18d16306d31fffce15 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 8 Jul 2018 03:41:30 +1200 Subject: Arrange for Ctrl-C to remap over Escape This way, InsertLeave actually gets fired. --- vim/bundle/insert_cancel | 2 +- vim/vimrc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vim/bundle/insert_cancel b/vim/bundle/insert_cancel index c55d432f..8228d9f7 160000 --- a/vim/bundle/insert_cancel +++ b/vim/bundle/insert_cancel @@ -1 +1 @@ -Subproject commit c55d432ff756495c15032c22f6f8f57673569b4b +Subproject commit 8228d9f73730fb751ab7aab301bc07286b45a36b diff --git a/vim/vimrc b/vim/vimrc index d4989489..efea641d 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -167,9 +167,9 @@ endif nnoremap :nohlsearch vnoremap :nohlsearchgv -" Stack insert Ctrl-C to undo the escaped insert operation +" Remap insert Ctrl-C to undo the escaped insert operation " Default to not-quite-correct vim-tiny-compatible map if no plugin -inoremap InsertCancel u +inoremap InsertCancel u imap InsertCancel " Remap normal J to stay in place while joining lines -- cgit v1.2.3 From 317e4603dc9b930ab65ad8cdcddc1605642c8368 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 8 Jul 2018 13:35:35 +1200 Subject: Restore Vim buffer mapping to unload script --- vim/after/ftplugin/vim.vim | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/vim/after/ftplugin/vim.vim b/vim/after/ftplugin/vim.vim index 5726e1e4..6c04e1f4 100644 --- a/vim/after/ftplugin/vim.vim +++ b/vim/after/ftplugin/vim.vim @@ -23,16 +23,17 @@ nnoremap l let b:undo_ftplugin = b:undo_ftplugin \ . '|nunmap l' -" Just get rid of the core ftplugin's square-bracket maps; I don't use them -silent! nunmap [[ -silent! vunmap [[ -silent! nunmap ]] -silent! vunmap ]] -silent! nunmap [] -silent! vunmap [] -silent! nunmap ][ -silent! vunmap ][ -silent! nunmap ]" -silent! vunmap ]" -silent! nunmap [" -silent! vunmap [" +" Get rid of the core ftplugin's square-bracket maps on unload +let b:undo_ftplugin = b:undo_ftplugin + \ . '|silent! nunmap [[' + \ . '|silent! vunmap [[' + \ . '|silent! nunmap ]]' + \ . '|silent! vunmap ]]' + \ . '|silent! nunmap []' + \ . '|silent! vunmap []' + \ . '|silent! nunmap ][' + \ . '|silent! vunmap ][' + \ . '|silent! nunmap ]"' + \ . '|silent! vunmap ]"' + \ . '|silent! nunmap ["' + \ . '|silent! vunmap ["' -- cgit v1.2.3 From 8333e1283e797d58f2cd7aa4226fc294851b16ad Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 8 Jul 2018 14:42:24 +1200 Subject: Remove error suppression on Vim unmaps --- vim/after/ftplugin/vim.vim | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/vim/after/ftplugin/vim.vim b/vim/after/ftplugin/vim.vim index 6c04e1f4..9710b2d8 100644 --- a/vim/after/ftplugin/vim.vim +++ b/vim/after/ftplugin/vim.vim @@ -25,15 +25,15 @@ let b:undo_ftplugin = b:undo_ftplugin " Get rid of the core ftplugin's square-bracket maps on unload let b:undo_ftplugin = b:undo_ftplugin - \ . '|silent! nunmap [[' - \ . '|silent! vunmap [[' - \ . '|silent! nunmap ]]' - \ . '|silent! vunmap ]]' - \ . '|silent! nunmap []' - \ . '|silent! vunmap []' - \ . '|silent! nunmap ][' - \ . '|silent! vunmap ][' - \ . '|silent! nunmap ]"' - \ . '|silent! vunmap ]"' - \ . '|silent! nunmap ["' - \ . '|silent! vunmap ["' + \ . '|nunmap [[' + \ . '|vunmap [[' + \ . '|nunmap ]]' + \ . '|vunmap ]]' + \ . '|nunmap []' + \ . '|vunmap []' + \ . '|nunmap ][' + \ . '|vunmap ][' + \ . '|nunmap ]"' + \ . '|vunmap ]"' + \ . '|nunmap ["' + \ . '|vunmap ["' -- cgit v1.2.3 From 8b6be81ecc1884e6836a74e5541cc50f30183d68 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 8 Jul 2018 14:45:15 +1200 Subject: Unmap PHP bracket maps --- vim/after/ftplugin/php.vim | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/vim/after/ftplugin/php.vim b/vim/after/ftplugin/php.vim index 587062e5..70e92dfd 100644 --- a/vim/after/ftplugin/php.vim +++ b/vim/after/ftplugin/php.vim @@ -28,3 +28,10 @@ nnoremap c \ :call compiler#Make('php') let b:undo_ftplugin = b:undo_ftplugin \ . '|nunmap c' + +" Get rid of the core ftplugin's square-bracket maps on unload +let b:undo_ftplugin = b:undo_ftplugin + \ . '|nunmap [[' + \ . '|ounmap [[' + \ . '|nunmap ]]' + \ . '|ounmap ]]' -- cgit v1.2.3 From 557ab6007d9eacfc271eb71aff0110e1c68c2583 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 8 Jul 2018 15:20:19 +1200 Subject: Add \N to toggle Vim 'ruler' --- vim/vimrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vim/vimrc b/vim/vimrc index efea641d..cd8e5b39 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -248,6 +248,8 @@ nnoremap m :map nnoremap M :map " \n toggles line numbers nnoremap n :set number! number? +" \N toggles 'ruler' +nnoremap N :set ruler! ruler? " \o opens a line below in paste mode nmap o PasteOpenBelow " \o opens a line above in paste mode -- cgit v1.2.3 From 5372879fd1cbcdf254e15d98020d1369278adceb Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 8 Jul 2018 15:22:55 +1200 Subject: Keep more Vim history --- vim/vimrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vim/vimrc b/vim/vimrc index cd8e5b39..06ebb4f7 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -72,6 +72,9 @@ if v:version > 703 || v:version == 703 && has('patch541') set formatoptions+=j endif +" Keep more command and search history +set history=500 + " Don't assume I'm editing C; let the filetype set this set include= -- cgit v1.2.3 From 07d5852f1b8b3479aca1169df90137be54ed5fb2 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 8 Jul 2018 15:59:42 +1200 Subject: Use :setglobal and :setlocal in .vimrc So that if the file gets reloaded, stuff in filetype buffers doesn't get its settings messed with. --- vim/vimrc | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/vim/vimrc b/vim/vimrc index 06ebb4f7..f8d5a80e 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -32,15 +32,15 @@ if has('syntax') && !exists('g:syntax_on') endif " The all-important default indent settings; filetypes to tweak -set autoindent " Use indent of previous line on new lines -set expandtab " Use spaces instead of tabs -set shiftwidth=4 " Indent with four spaces +setglobal autoindent " Use indent of previous line on new lines +setglobal expandtab " Use spaces instead of tabs +setglobal shiftwidth=4 " Indent with four spaces " Spaces to insert on Tab key insert if v:version > 703 || v:version == 703 && has('patch693') - set softtabstop=-1 " Refer to 'shiftwidth' if supported + setglobal softtabstop=-1 " Refer to 'shiftwidth' if supported else - set softtabstop=4 " Otherwise just four spaces + setglobal softtabstop=4 " Otherwise just four spaces endif " Let me backspace over pretty much anything @@ -69,14 +69,14 @@ endif " Delete comment leaders when joining lines, if supported if v:version > 703 || v:version == 703 && has('patch541') - set formatoptions+=j + setglobal formatoptions+=j endif " Keep more command and search history set history=500 " Don't assume I'm editing C; let the filetype set this -set include= +setglobal include= " Don't join lines with two spaces at the end of sentences set nojoinspaces @@ -99,13 +99,13 @@ if v:version >= 700 endif " Add angle brackets to pairs of matched characters -set matchpairs+=<:> +setglobal matchpairs+=<:> " Don't allow setting options via buffer content -set nomodeline +setglobal nomodeline " Treat numbers with a leading zero as decimal, not octal -set nrformats-=octal +setglobal nrformats-=octal " Abbreviate some more regularly displayed messages set shortmess+=I " Don't show startup splash screen @@ -115,7 +115,7 @@ set shortmess+=w " written -> [w], appended -> [a] " Clear default 'comments' value, let the filetype handle it if has('comments') - set comments= + setglobal comments= endif " Highlight settings for search @@ -127,7 +127,7 @@ endif " More sensible language-agnostic setting for gf/:find if has('file_in_path') - set path=.,,** + setglobal path=.,,** endif " Don't load GUI menus; set here before GUI starts @@ -137,10 +137,10 @@ endif " Line break behaviour settings for 'wrap' if has('linebreak') - set linebreak " Break lines at word boundaries - set showbreak=... " Prefix wrapped rows with three dots + setglobal linebreak " Break lines at word boundaries + set showbreak=... " Prefix wrapped rows with three dots if exists('+breakindent') - set breakindent " Indent wrapped lines, if supported + setglobal breakindent " Indent wrapped lines, if supported endif endif @@ -222,17 +222,17 @@ nnoremap a :ToggleOptionFlagLocal formatoptions a " \b toggles copy-pasteable linebreak settings nmap b CopyLinebreakToggle " \c toggles 'cursorline' -nnoremap c :set cursorline! cursorline? +nnoremap c :setlocal cursorline! cursorline? " \C toggles 'cursorcolumn' -nnoremap C :set cursorcolumn! cursorcolumn? +nnoremap C :setlocal cursorcolumn! cursorcolumn? " \d inserts the local date (POSIX date) 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 :set modifiable noreadonly +nnoremap e :setlocal modifiable noreadonly " \f shows the current 'formatoptions' at a glance -nnoremap f :set formatoptions? +nnoremap f :setlocal formatoptions? " \g changes directory to the current file's location nnoremap g :cd %:h:pwd " \h toggles highlighting search results @@ -244,13 +244,13 @@ nnoremap j :buffers:buffer " \k shows my marks nnoremap k :marks " \l toggles showing tab, end-of-line, and trailing whitespace -nnoremap l :set list! list? +nnoremap l :setlocal list! list? " \m shows all maps nnoremap m :map " \M shows buffer-local maps nnoremap M :map " \n toggles line numbers -nnoremap n :set number! number? +nnoremap n :setlocal number! number? " \N toggles 'ruler' nnoremap N :set ruler! ruler? " \o opens a line below in paste mode @@ -266,7 +266,7 @@ nnoremap r :source $MYVIMRC " \s toggles spell checking nnoremap s :setlocal spell! spell? " \t shows current filetype -nnoremap t :set filetype? +nnoremap t :setlocal filetype? " \u sets US English spelling (compare \z) nnoremap u :setlocal spelllang=en_us " \v shows all global variables @@ -274,7 +274,7 @@ nnoremap v :let g: v: " \V shows all local variables nnoremap V :let b: t: w: " \w toggles wrapping -nnoremap w :set wrap! wrap? +nnoremap w :setlocal wrap! wrap? " \x strips trailing whitespace via a custom plugin nmap x StripTrailingWhitespace " \y shows all registers -- cgit v1.2.3 From 1cf8247e025b27f72bec4fde73460528ac20bcdb Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 8 Jul 2018 16:07:03 +1200 Subject: Separate and maps --- vim/vimrc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/vim/vimrc b/vim/vimrc index f8d5a80e..9485921a 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -180,12 +180,15 @@ imap InsertCancel nnoremap FixedJoin mzJ`z nmap J FixedJoin -" Remap normal/visual to scroll down a page, and to scroll -" back up +" Remap normal/visual to scroll down a page nnoremap -nnoremap if v:version >= 700 xnoremap +endif + +" Remap normal/visual to scroll up a page +nnoremap +if v:version >= 700 xnoremap endif -- cgit v1.2.3 From aebe4e709584692a729ad3e3ee8fc07304f28507 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 8 Jul 2018 16:07:33 +1200 Subject: Add \R for filetype reloading --- vim/vimrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vim/vimrc b/vim/vimrc index 9485921a..b0328af7 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -266,6 +266,8 @@ nnoremap p :set paste! paste? nnoremap q gqap " \r reloads .vimrc nnoremap r :source $MYVIMRC +" \R reloads filetype +nnoremap R :doautocmd filetypedetect BufRead " \s toggles spell checking nnoremap s :setlocal spell! spell? " \t shows current filetype -- cgit v1.2.3 From a523c9e85bba4cb6fb7d58c57c74d98b34d806c5 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 8 Jul 2018 16:08:28 +1200 Subject: Add .vimrc reload flag and message --- vim/vimrc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/vim/vimrc b/vim/vimrc index b0328af7..e93bcba1 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -294,3 +294,11 @@ nnoremap :enew " Source any .vim files from ~/.vim/config runtime! config/*.vim + +" Flag that we loaded, tell the user if we reload +if 1 + if exists('g:loaded_vimrc') + echomsg 'Reloaded vimrc: '.$MYVIMRC + endif + let g:loaded_vimrc = 1 +endif -- cgit v1.2.3 From 3875b6caf69cc08467438d03a4b83b624f369aa0 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 8 Jul 2018 16:17:48 +1200 Subject: Add \T map to clear filetype --- vim/vimrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vim/vimrc b/vim/vimrc index e93bcba1..982bd5ba 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -272,6 +272,8 @@ nnoremap R :doautocmd filetypedetect BufRead nnoremap s :setlocal spell! spell? " \t shows current filetype nnoremap t :setlocal filetype? +" \T clears filetype (follow with \R) +nnoremap T :setlocal filetype=NONE " \u sets US English spelling (compare \z) nnoremap u :setlocal spelllang=en_us " \v shows all global variables -- cgit v1.2.3 From e365cadd8b33c866c34bdf4413d65624bbba519b Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 8 Jul 2018 16:20:33 +1200 Subject: Bump VERSION --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 7bc1fd01..423aa0de 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -tejr dotfiles v1.23.1 -Sat Jul 7 04:16:46 UTC 2018 +tejr dotfiles v1.24.0 +Sun Jul 8 04:20:25 UTC 2018 -- cgit v1.2.3