From 60eab724a29101c54c2d5d1cccd56385a8e5a85c Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sat, 4 Aug 2018 23:11:47 +1200 Subject: Let's try leaving netrw on again for a bit --- vim/after/plugin/dist.vim | 1 - vim/plugin/dist.vim | 2 -- 2 files changed, 3 deletions(-) diff --git a/vim/after/plugin/dist.vim b/vim/after/plugin/dist.vim index 4613925f..bc8995b6 100644 --- a/vim/after/plugin/dist.vim +++ b/vim/after/plugin/dist.vim @@ -2,7 +2,6 @@ unlet! g:loaded_getscriptPlugin unlet! g:loaded_vimballPlugin unlet! g:loaded_logiPat -unlet! g:loaded_netrwPlugin unlet! g:loaded_rrhelper unlet! g:loaded_spellfile_plugin unlet! g:loaded_gzip diff --git a/vim/plugin/dist.vim b/vim/plugin/dist.vim index 53962c93..ac3671a2 100644 --- a/vim/plugin/dist.vim +++ b/vim/plugin/dist.vim @@ -8,8 +8,6 @@ let g:loaded_tarPlugin = 1 let g:loaded_zipPlugin = 1 " I prefer filtering text with Unix tools let g:loaded_logiPat = 1 -" The shell, tab completion, and 'wildmenu' are good enough -let g:loaded_netrwPlugin = 1 " I don't use Vim servers let g:loaded_rrhelper = 1 " I don't need extra spelling files -- cgit v1.2.3 From 5ba466f14dfd7604bd96491586d6d4b5ff3fb10f Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 5 Aug 2018 10:03:14 +1200 Subject: Remove surround.vim's insert mode maps --- vim/after/plugin/surround.vim | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 vim/after/plugin/surround.vim diff --git a/vim/after/plugin/surround.vim b/vim/after/plugin/surround.vim new file mode 100644 index 00000000..b1face5f --- /dev/null +++ b/vim/after/plugin/surround.vim @@ -0,0 +1,6 @@ +" Remove surround.vim's insert mode maps +iunmap ISurround +iunmap Isurround +iunmap S +iunmap s +iunmap -- cgit v1.2.3 From ab3a40ee21f5fb9cbcb0bb67eb98fe5cd3772f55 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 5 Aug 2018 20:42:21 +1200 Subject: Use pman as 'keywordprg' for PHP --- vim/after/ftplugin/php.vim | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vim/after/ftplugin/php.vim b/vim/after/ftplugin/php.vim index c98c1264..9b7c2bb0 100644 --- a/vim/after/ftplugin/php.vim +++ b/vim/after/ftplugin/php.vim @@ -13,6 +13,10 @@ setlocal comments=s1:/*,m:*,ex:*/,://,:# setlocal formatoptions+=or let b:undo_ftplugin .= '|setlocal comments< formatoptions<' +" Use pman as 'keywordprg' +setlocal keywordprg=pman +let b:undo_ftplugin .= '|setlocal keywordprg<' + " Stop here if the user doesn't want ftplugin mappings if exists('g:no_plugin_maps') || exists('g:no_php_maps') finish -- cgit v1.2.3 From 342e7ac6c6963a95be5747b2d066b0ad62355f4e Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 5 Aug 2018 21:21:23 +1200 Subject: Strip a trailing space --- vim/after/ftplugin/perl.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/after/ftplugin/perl.vim b/vim/after/ftplugin/perl.vim index 777c3ad4..9c3ce6f6 100644 --- a/vim/after/ftplugin/perl.vim +++ b/vim/after/ftplugin/perl.vim @@ -1,5 +1,5 @@ " Extra configuration for Perl filetypes -if &filetype !=# 'perl' || v:version < 700 || &compatible +if &filetype !=# 'perl' || v:version < 700 || &compatible finish endif -- cgit v1.2.3 From 632285565e177ae1c0e980b31c3340b8172b1a30 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 5 Aug 2018 21:22:34 +1200 Subject: Remove markdown_autoformat.vim ftplugin It's pretty clumsy and doesn't really work that well. --- .gitmodules | 3 --- vim/bundle/markdown_autoformat | 1 - 2 files changed, 4 deletions(-) delete mode 160000 vim/bundle/markdown_autoformat diff --git a/.gitmodules b/.gitmodules index a695d790..38a03a11 100644 --- a/.gitmodules +++ b/.gitmodules @@ -61,9 +61,6 @@ [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/perl_version_bump"] path = vim/bundle/perl_version_bump url = https://sanctum.geek.nz/code/vim-perl-version-bump.git diff --git a/vim/bundle/markdown_autoformat b/vim/bundle/markdown_autoformat deleted file mode 160000 index dc5d9640..00000000 --- a/vim/bundle/markdown_autoformat +++ /dev/null @@ -1 +0,0 @@ -Subproject commit dc5d96400412f63a170e87bc7e947743df07b76f -- cgit v1.2.3 From 658341783f6562cc44e0fde7f2966d9505575a45 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Mon, 6 Aug 2018 09:04:36 +1200 Subject: Add explicit LC_COLLATE settings to plmu(1df) This prevents it getting upset if the sorting for the ignore list used a different collation. --- bin/plmu.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/plmu.sh b/bin/plmu.sh index 78778920..06d5ce1d 100644 --- a/bin/plmu.sh +++ b/bin/plmu.sh @@ -12,10 +12,10 @@ fi # Get the list of modules; sort them in case our current locale disagrees on # the existing sorting -plenv list-modules | sort | +plenv list-modules | LC_COLLATE=C sort | # Exclude any modules in ~/.plenv/non-cpanm-modules if it exists -comm -23 -- - "$ef" | +LC_COLLATE=C comm -23 -- - "$ef" | # Read that list of modules to upgrade and upgrade them one by one while read -r module ; do -- cgit v1.2.3 From 9c05d0aaa8b3d95d6defd05aa1c352e28be43c01 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Mon, 6 Aug 2018 09:20:41 +1200 Subject: Use ^= instead of += for arbitrary text options This avoids an edge case where arbitrary text at the end of a directory name or flag:value disrupts the meaning of the added object. This was already applied for 'backupdir', 'directory', and 'undodir', but it needed to be added in a couple of other places too. --- vim/vimrc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/vim/vimrc b/vim/vimrc index 6b181fa7..e9fbaf3f 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -49,8 +49,8 @@ set backup set backupdir^=~/.vim/cache/backup,~/vimfiles/cache/backup " Add some paths not to back up -set backupskip+=/dev/shm/* -set backupskip+=/var/tmp/* +set backupskip^=/dev/shm/* +set backupskip^=/var/tmp/* " Indent wrapped lines silent! set breakindent @@ -113,11 +113,11 @@ set lazyredraw set linebreak " Define extra 'list' display characters -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 -silent! set listchars+=nbsp:+ " Non-breaking spaces +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 +silent! set listchars^=nbsp:+ " Non-breaking spaces " Don't allow setting options via buffer content set nomodeline @@ -127,7 +127,7 @@ set nrformats-=octal " Options for file search with gf/:find set path-=/usr/include " Let the C/C++ filetypes set that -set path+=** " Search current directory's whole tree +set path^=** " Search current directory's whole tree " Don't show startup splash screen (I donated) set shortmess+=I -- cgit v1.2.3 From 43e2766622132d55bb2a63d44129c419ee215e99 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Mon, 6 Aug 2018 09:39:16 +1200 Subject: Make cursor start heuristics for mail smarter Move immediately below the first thing we might want to reply to --- vim/after/ftplugin/mail.vim | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/vim/after/ftplugin/mail.vim b/vim/after/ftplugin/mail.vim index 34c524e1..16c228cd 100644 --- a/vim/after/ftplugin/mail.vim +++ b/vim/after/ftplugin/mail.vim @@ -3,11 +3,17 @@ if &filetype !=# 'mail' || &compatible || v:version < 700 finish endif -" We will almost always want to start editing after the headers, so move to -" the first entirely blank line, if something hasn't already moved us from the -" start of the file +" If something hasn't already moved the cursor, we'll move to an optimal point +" to start writing if line('.') == 1 && col('.') == 1 - call search('\m^$', 'c') + + " Start by trying to move to the first quoted line; this may fail if there's + " no quote, which is fine + call search('\m^>', 'c') + + " Now move to the first quoted or unquoted blank line + call search('\m^>\=$', 'c') + endif " Add a space to the end of wrapped lines for format-flowed mail -- cgit v1.2.3 From 3b529f22fea622e7d4267927a688058d5c7a4500 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Mon, 6 Aug 2018 09:39:48 +1200 Subject: Strip generic greetings from quoted mail --- vim/after/ftplugin/mail.vim | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/vim/after/ftplugin/mail.vim b/vim/after/ftplugin/mail.vim index 16c228cd..2917425d 100644 --- a/vim/after/ftplugin/mail.vim +++ b/vim/after/ftplugin/mail.vim @@ -11,6 +11,15 @@ if line('.') == 1 && col('.') == 1 " no quote, which is fine call search('\m^>', 'c') + " Check this line to see if it's a generic hello-name greeting that we can + " just strip out; delete the following line too, if it's blank + if getline('.') =~? '^>\s*\%($' + delete + endif + endif + " Now move to the first quoted or unquoted blank line call search('\m^>\=$', 'c') -- cgit v1.2.3 From cf844ae1ca2ed8022db543aeaedb299890560b37 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Mon, 6 Aug 2018 09:56:57 +1200 Subject: Bump VERSION --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index a43eacc3..c84e8102 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -tejr dotfiles v1.44.0 -Sat Aug 4 09:13:25 UTC 2018 +tejr dotfiles v1.46.0 +Sun Aug 5 21:56:57 UTC 2018 -- cgit v1.2.3