diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2022-08-08 00:53:33 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2022-08-08 00:53:33 +1200 |
commit | af79556e70349e59938e6c74bf3273cdafde16e6 (patch) | |
tree | 643a96df5ed4f65fa9cb238ff285141aef83b190 | |
parent | Merge branch 'release/v12.17.0' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-af79556e70349e59938e6c74bf3273cdafde16e6.tar.gz dotfiles-af79556e70349e59938e6c74bf3273cdafde16e6.zip |
Merge branch 'release/v12.18.0'v12.18.0
* release/v12.18.0:
Don't start POSIX-compliant Vim on "vi" name
Update cgit URLs
-rw-r--r-- | VERSION | 4 | ||||
-rw-r--r-- | vim/vimrc | 26 | ||||
-rw-r--r-- | vim/vimrc.stub | 2 |
3 files changed, 16 insertions, 16 deletions
@@ -1,2 +1,2 @@ -tejr dotfiles v12.17.0 -Thu, 04 Aug 2022 09:19:01 +0000 +tejr dotfiles v12.18.0 +Sun, 07 Aug 2022 12:53:28 +0000 @@ -25,7 +25,7 @@ " <http://www.literateprogramming.com/> " " The dotfiles project as part of which it is maintained is here: -" <https://sanctum.geek.nz/cgit/dotfiles.git> +" <https://dev.sanctum.geek.nz/cgit/dotfiles.git> " " This is a long file, and comments abound. Should this be bothersome, one " could execute this command in Vim itself, to strip out comment blocks and @@ -1068,7 +1068,7 @@ nnoremap <expr> <Space> " > Í I' LATIN CAPITAL LETTER I WITH ACUTE " > ...etc... " -" <https://sanctum.geek.nz/cgit/vim-digraph-search.git/about/> +" <https://dev.sanctum.geek.nz/cgit/vim-digraph-search.git/about/> " " This leaves you in insert mode, ready to hit CTRL-K one more time and then " type the digraph that you've hopefully found. @@ -1127,7 +1127,7 @@ sunmap & " didn't seem to be an analogue for a motion to filter text through an " internal command like :sort, so I wrote one. " -" <https://sanctum.geek.nz/cgit/vim-colon-operator.git/about/> +" <https://dev.sanctum.geek.nz/cgit/vim-colon-operator.git/about/> " nmap g: \ <Plug>(ColonOperator) @@ -1164,7 +1164,7 @@ nnoremap ]l " put_blank_lines.vim. These use operator functions so that they're " repeatable without repeat.vim. They accept count prefixes, too. " -" <https://sanctum.geek.nz/cgit/vim-put-blank-lines.git/about/> +" <https://dev.sanctum.geek.nz/cgit/vim-put-blank-lines.git/about/> " nmap [<Space> \ <Plug>(PutBlankLinesAbove) @@ -1282,7 +1282,7 @@ nnoremap <Leader>u " larger blocks of text or for manipulating the text as it leaves the buffer, " it makes more sense to use :! commands. " -" <https://sanctum.geek.nz/cgit/vim-copy-linebreak.git/about/> +" <https://dev.sanctum.geek.nz/cgit/vim-copy-linebreak.git/about/> " "" Leader,b toggles settings friendly to copying and pasting @@ -1420,11 +1420,11 @@ nmap <Leader>o " buffer text. All of these mappings use commands from my custom plugins: " " :KeepPosition -" <https://sanctum.geek.nz/cgit/vim-keep-position.git/about/> +" <https://dev.sanctum.geek.nz/cgit/vim-keep-position.git/about/> " :SqueezeRepeatBlanks -" <https://sanctum.geek.nz/cgit/vim-squeeze-repeat-blanks.git/about/> +" <https://dev.sanctum.geek.nz/cgit/vim-squeeze-repeat-blanks.git/about/> " :StripTrailingWhitespace -" <https://sanctum.geek.nz/cgit/vim-strip-trailing-whitespace.git/about/> +" <https://dev.sanctum.geek.nz/cgit/vim-strip-trailing-whitespace.git/about/> " "" Leader,x strips trailing whitespace @@ -1461,7 +1461,7 @@ omap <Leader>5 " This group defines some useful motions, including navigating by indent " block using a custom plugin: " -" <https://sanctum.geek.nz/cgit/vim-vertical-region.git/about/> +" <https://dev.sanctum.geek.nz/cgit/vim-vertical-region.git/about/> " "" Leader,{ and Leader,} move to top and bottom of indent region @@ -1497,10 +1497,10 @@ nnoremap <Leader>? " other place. The plugin mappings probably require their own documentation " comment block, but my hands are getting tired from all this typing. " -" * <https://sanctum.geek.nz/cgit/vim-alternate-filetype.git/about/> -" * <https://sanctum.geek.nz/cgit/vim-regex-escape.git/about/> -" * <https://sanctum.geek.nz/cgit/vim-replace-operator.git/about/> -" * <https://sanctum.geek.nz/cgit/vim-scratch-buffer.git/about/> +" * <https://dev.sanctum.geek.nz/cgit/vim-alternate-filetype.git/about/> +" * <https://dev.sanctum.geek.nz/cgit/vim-regex-escape.git/about/> +" * <https://dev.sanctum.geek.nz/cgit/vim-replace-operator.git/about/> +" * <https://dev.sanctum.geek.nz/cgit/vim-scratch-buffer.git/about/> " "" Leader,. runs the configured make program into the location list diff --git a/vim/vimrc.stub b/vim/vimrc.stub index 486c71e0..23a90608 100644 --- a/vim/vimrc.stub +++ b/vim/vimrc.stub @@ -7,7 +7,7 @@ " glory, and then stop sourcing the rest of this file. " if !&compatible && !exists('$POSIXLY_CORRECT') - if v:version >= 700 && v:progname !=# 'vi' + if v:version >= 700 runtime vimrc finish endif |