diff options
Diffstat (limited to 'vim')
| -rw-r--r-- | vim/after/ftplugin/python.vim | 10 | ||||
| -rw-r--r-- | vim/autoload/xdg.vim | 12 | ||||
| m--------- | vim/bundle/copy_linebreak | 0 | ||||
| m--------- | vim/bundle/spellfile_local | 0 | ||||
| m--------- | vim/bundle/strip_trailing_whitespace | 0 | ||||
| -rw-r--r-- | vim/filetype.vim | 143 | ||||
| -rw-r--r-- | vim/ftplugin/textarea.vim | 12 | ||||
| -rw-r--r-- | vim/plugin/matchit.vim | 2 | ||||
| -rw-r--r-- | vim/vimrc | 98 | ||||
| -rw-r--r-- | vim/vimrc.stub | 9 |
10 files changed, 164 insertions, 122 deletions
diff --git a/vim/after/ftplugin/python.vim b/vim/after/ftplugin/python.vim index b5071e3b..2ca1ae89 100644 --- a/vim/after/ftplugin/python.vim +++ b/vim/after/ftplugin/python.vim @@ -1,3 +1,11 @@ +" The Python runtime files didn't define b:undo_ftplugin until Vim v8.1.1048; +" if it's not set yet, set it here (to something innoccuous) so that the +" appending :let commands in the rest of this file don't break. +" +if !exists('b:undo_ftplugin') + let b:undo_ftplugin = 'setlocal tabstop<' +endif + " Use pyflakes for syntax checking and autopep8 for tidying compiler pyflakes if executable('autopep8') @@ -20,7 +28,7 @@ let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>c' " Mappings to choose 'equalprg' nnoremap <buffer> <LocalLeader>t - \ :<C-U>setlocal equalprg=equalprg=autopep8\ -aaa\ --\ -<CR> + \ :<C-U>setlocal equalprg=autopep8\ -aaa\ --\ -<CR> nnoremap <buffer> <LocalLeader>i \ :<C-U>setlocal equalprg<<CR> let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>t' diff --git a/vim/autoload/xdg.vim b/vim/autoload/xdg.vim index 90ea9c2f..cb7adcf5 100644 --- a/vim/autoload/xdg.vim +++ b/vim/autoload/xdg.vim @@ -43,25 +43,25 @@ function! s:Dirs(name) abort endfunction function! xdg#CacheHome() abort - return s:Home('XDG_CACHE_HOME') + return has('unix') ? s:Home('XDG_CACHE_HOME') : '' endfunction function! xdg#ConfigHome() abort - return s:Home('XDG_CONFIG_HOME') + return has('unix') ? s:Home('XDG_CONFIG_HOME') : '' endfunction function! xdg#DataHome() abort - return s:Home('XDG_DATA_HOME') + return has('unix') ? s:Home('XDG_DATA_HOME') : '' endfunction function! xdg#StateHome() abort - return s:Home('XDG_STATE_HOME') + return has('unix') ? s:Home('XDG_STATE_HOME') : '' endfunction function! xdg#ConfigDirs() abort - return s:Dirs('XDG_CONFIG_DIRS') + return has('unix') ? s:Dirs('XDG_CONFIG_DIRS') : [] endfunction function! xdg#DataDirs() abort - return s:Dirs('XDG_DATA_DIRS') + return has('unix') ? s:Dirs('XDG_DATA_DIRS') : [] endfunction diff --git a/vim/bundle/copy_linebreak b/vim/bundle/copy_linebreak -Subproject 6692eef760ccfc2e1b888d1d604e3e1a156fcbc +Subproject a0004c18da5f524f62e2da6e19be1a51ce282f3 diff --git a/vim/bundle/spellfile_local b/vim/bundle/spellfile_local -Subproject 0958f0f8d9754b2e7571b6a50f4db434b719564 +Subproject 6199ee785c6fb964292ec6e82c5b8a0f79e2606 diff --git a/vim/bundle/strip_trailing_whitespace b/vim/bundle/strip_trailing_whitespace -Subproject 90e60095bcfcfeb60bea60ba7f51bbfac3bf469 +Subproject 03782cdaf9db6329665316e1dc2d1b8270714a3 diff --git a/vim/filetype.vim b/vim/filetype.vim index 60221c83..eea7f1f5 100644 --- a/vim/filetype.vim +++ b/vim/filetype.vim @@ -24,6 +24,7 @@ augroup filetypedetect " Apache config autocmd BufNewFile,BufRead \ .htaccess + \,htaccess \,*/apache*/?*.conf \ setfiletype apache " Assembly language files @@ -67,6 +68,16 @@ augroup filetypedetect autocmd BufNewFile,BufRead \ ?*.csv \ setfiletype csv + " Debian package sources + autocmd BufNewFile,BufRead + \ sources.list + \,*/etc/apt/sources.list.d/*.list + \ setfiletype debsources + " Desktop files + autocmd BufNewFile,BufRead + \ ?*.desktop + \,?*.directory + \ setfiletype desktop " Diff and patch files autocmd BufNewFile,BufRead \ ?*.diff @@ -76,6 +87,7 @@ augroup filetypedetect " INI format files autocmd BufNewFile,BufRead \ ?*.ini + \,.editorconfig \,perlcriticrc \,.perlcriticrc \ setfiletype dosini @@ -83,6 +95,10 @@ augroup filetypedetect autocmd BufNewFile,BufRead \ ?*.dot \ setfiletype dot + " NFS exports + autocmd BufNewFile,BufRead + \ exports + \ setfiletype exports " Forth autocmd BufNewFile,BufRead \ ?*.fs,?*.ft @@ -95,11 +111,18 @@ augroup filetypedetect autocmd BufNewFile,BufRead \ .gdbinit \ setfiletype gdb + " Gemini markup + autocmd BufNewFile,BufRead + \ *.gmi + \,*.gemini + \ setfiletype gemtext " Git commit messages autocmd BufNewFile,BufRead \ COMMIT_EDITMSG + \,EDIT_DESCRIPTION \,MERGE_MSG \,TAG_EDITMSG + \,NOTES_EDITMSG \ setfiletype gitcommit " Git config files autocmd BufNewFile,BufRead @@ -107,7 +130,7 @@ augroup filetypedetect \,.gitconfig \,.gitmodules \,gitconfig - \,~/.config/git/config + \,*/.config/git/config \ setfiletype gitconfig " Git rebase manifests autocmd BufNewFile,BufRead @@ -124,24 +147,23 @@ augroup filetypedetect \ setfiletype go " UNIX group file autocmd BufNewFile,BufRead - \ /etc/group - \,/etc/group- - \,/etc/group.edit - \,/etc/gshadow - \,/etc/gshadow- - \,/etc/gshadow.edit + \ */etc/group + \,*/etc/group- + \,*/etc/group.edit + \,*/etc/gshadow + \,*/etc/gshadow- + \,*/etc/gshadow.edit \ setfiletype group " GTK settings files autocmd BufNewFile,BufRead - \ .gktrc*, - \,gktrc* + \ .gtkrc* + \,gtkrc* \ setfiletype gtkrc " Vim help files autocmd BufNewFile,BufRead - \ ~/.vim/doc/?*.txt + \ */*.vim/doc/?*.txt \,*/vim-*/doc/?*.txt \,*/vim/*/doc/?*.txt - \,*/*.vim/doc/?*.txt \,$VIMRUNTIME/doc/?*.txt \ setfiletype help " HTML files @@ -151,7 +173,7 @@ augroup filetypedetect \ setfiletype html " hosts(5) file autocmd BufNewFile,BufRead - \ /etc/hosts + \ */etc/hosts \ setfiletype hostconf " inittab(5) files autocmd BufNewFile,BufRead @@ -191,10 +213,19 @@ augroup filetypedetect \,.emacs \,emacs \ setfiletype lisp + " Login configuration + autocmd BufNewFile,BufRead + \ */etc/login.defs + \ setf logindefs " Lua files autocmd BufNewFile,BufRead \ ?*.lua \ setfiletype lua + " Lynx configuration + au BufNewFile,BufRead + \ lynx.cfg + \,.lynxrc + \ setfiletype lynx " m4 files autocmd BufNewFile,BufRead \ ?*.m4 @@ -224,6 +255,16 @@ augroup filetypedetect \ ?*.markdown \,?*.md \ setfiletype markdown + " Meson configuration + autocmd BufNewFile,BufRead + \ meson.build + \,meson_options.txt + \ setfiletype meson + " SNMP MIB files + autocmd BufNewFile,BufRead + \ *.mib + \,*.my + \ setfiletype mib " Mutt configuration files autocmd BufNewFile,BufRead \ Muttrc @@ -231,7 +272,7 @@ augroup filetypedetect \,*/muttrc.d/?*.rc \,.muttrc \,muttrc - \,/etc/Muttrc.d/* + \,*/etc/Muttrc.d/* \ setfiletype muttrc " BIND configuration file autocmd BufNewFile,BufRead @@ -257,12 +298,12 @@ augroup filetypedetect \ setfiletype nroff " UNIX password and shadow files autocmd BufNewFile,BufRead - \ /etc/passwd - \,/etc/passwd- - \,/etc/passwd.edit - \,/etc/shadow - \,/etc/shadow- - \,/etc/shadow.edit + \ */etc/passwd + \,*/etc/passwd- + \,*/etc/passwd.edit + \,*/etc/shadow + \,*/etc/shadow- + \,*/etc/shadow.edit \ setfiletype passwd " Packet capture files autocmd BufNewFile,BufRead @@ -300,6 +341,9 @@ augroup filetypedetect " Python files autocmd BufNewFile,BufRead \ ?*.py + \,?*.pyw + \,?*.pythonstartup + \,?*.pythonrc \ setfiletype python " Readline configuration file autocmd BufNewFile,BufRead @@ -324,17 +368,27 @@ augroup filetypedetect autocmd BufNewFile,BufRead \ ?*.rb \ setfiletype ruby + " Rust + autocmd BufNewFile,BufRead + \ ?*.rs + \ setfiletype rust " Samba config autocmd BufNewFile,BufRead \ smb.conf \ setfiletype samba + " Scheme + au BufNewFile,BufRead + \ ?*.scm + \,*.ss + \,*.sld + \ setfiletype scheme " sed files autocmd BufNewFile,BufRead \ ?*.sed \ setfiletype sed " Services files autocmd BufNewFile,BufRead - \ /etc/services + \ */etc/services \ setfiletype services " Bash shell autocmd BufNewFile,BufRead @@ -367,19 +421,21 @@ augroup filetypedetect \,.shinit \,.shrc \,.xinitrc + \,.xprofile \,.xsession \,.xsessionrc - \,/etc/default/* + \,*/etc/default/* \,configure \,profile \,shinit \,shrc \,xinitrc + \,xprofile \,xsession \,xsessionrc - \,/etc/X11/xinit - \,/etc/X11/Xreset - \,/etc/X11/Xsession + \,*/etc/X11/xinit + \,*/etc/X11/Xreset + \,*/etc/X11/Xsession \ let b:is_posix = 1 \|setfiletype sh " SQL @@ -387,17 +443,22 @@ augroup filetypedetect \ ?*.sql \ setfiletype sql " OpenSSH configuration + "" client autocmd BufNewFile,BufRead - \ ssh_config,*/.ssh/config + \ ssh_config + \,*/ssh_config.d/*.conf + \,*/.ssh/config, + \,*/.ssh/config.d/*.conf \ setfiletype sshconfig + "" server + autocmd BufNewFile,BufRead + \ sshd_config + \,*/sshd_config.d/*.conf + \ setfiletype sshdconfig " sudoers(5) autocmd BufNewFile,BufRead \ sudoers \,sudoers.tmp - \ setfiletype sshdconfig - " OpenSSH server configuration - autocmd BufNewFile,BufRead - \ sshd_config \ setfiletype sudoers " Subversion commit autocmd BufNewFile,BufRead @@ -405,8 +466,8 @@ augroup filetypedetect \ setfiletype svn " sysctl configuration files autocmd BufNewFile,BufRead - \ /etc/sysctl.conf - \,/etc/sysctl.d/*.conf + \ */etc/sysctl.conf + \,*/etc/sysctl.d/*.conf \ setfiletype sysctl " Systemd unit files autocmd BufNewFile,BufRead @@ -420,10 +481,6 @@ augroup filetypedetect autocmd BufNewFile,BufRead \ ?*.ti \ setfiletype terminfo - " TextEditorAnywhere text field - autocmd BufNewFile,BufRead - \ TextEditorAnywhere_??_??_??.txt - \ setfiletype textarea " Tidy config autocmd BufNewFile,BufRead \ .tidyrc @@ -434,6 +491,10 @@ augroup filetypedetect \ .tmux.conf \,tmux.conf \ setfiletype tmux + " TOML configuration files + autocmd BufNewFile,BufRead + \ ?*.toml + \ setfiletype toml " Tab-separated (TSV) files autocmd BufNewFile,BufRead \ ?*.tsv @@ -462,9 +523,7 @@ augroup filetypedetect " Add automatic commands to find .Xresources subfiles autocmd BufNewFile,BufRead \ .Xresources - \,*/.Xresources.d/* \,Xresources - \,*/Xresources.d/* \ setfiletype xdefaults " XHTML files autocmd BufNewFile,BufRead @@ -514,8 +573,8 @@ augroup filetypedetect " Clumsy attempt at typing files in `sudo -e` if a filename hasn't already " been found autocmd BufNewFile,BufRead - \ /var/tmp/?*????????.* - \,/var/tmp/?*.???????? + \ */var/tmp/?*????????.* + \,*/var/tmp/?*.???????? \ if !did_filetype() \| call filetype#repeat#Sudo() \|endif @@ -526,14 +585,14 @@ augroup filetypedetect \,?*.txt \,INSTALL \,README - \,/etc/issue - \,/etc/motd + \,*/etc/issue + \,*/etc/motd \ setfiletype text autocmd BufNewFile,BufRead \ ?*.cfg \,?*.conf \,?*.config - \,/etc/* + \,*/etc/* \ setfiletype conf autocmd BufNewFile,BufRead \ */log/* diff --git a/vim/ftplugin/textarea.vim b/vim/ftplugin/textarea.vim deleted file mode 100644 index 4db97b58..00000000 --- a/vim/ftplugin/textarea.vim +++ /dev/null @@ -1,12 +0,0 @@ -" Set mail message as an alternative filetype -if !exists('b:alternate_filetypes') - let b:alternate_filetypes = [&filetype, 'mail'] -endif - -" Stop here if the user doesn't want ftplugin mappings -if exists('no_plugin_maps') || exists('no_textarea_maps') - finish -endif - -" #s expands to the #signature tag used in Cerb -inoreabbrev #s #signature diff --git a/vim/plugin/matchit.vim b/vim/plugin/matchit.vim index f842bd9c..392b2728 100644 --- a/vim/plugin/matchit.vim +++ b/vim/plugin/matchit.vim @@ -1,5 +1,5 @@ " Get matchit.vim, one way or another -if has('packages') && !has('nvim') +if has('packages') packadd matchit else runtime macros/matchit.vim @@ -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 @@ -137,18 +137,16 @@ let $MYVIM = option#Split(&runtimepath)[0] " both the XDG_CONFIG_HOME and XDG_CONFIG_DIRS variables, or from their " defaults, using autoloaded xdg# functions. " -if has('unix') - let s:xdgconfigdirs - \ = xdg#ConfigDirs() - let s:xdgconfighome - \ = xdg#ConfigHome() - let s:xdgdatadirs - \ = xdg#DataDirs() - let s:xdgdatahome - \ = xdg#DataHome() - let s:xdgstatehome - \ = xdg#StateHome() -endif +let s:xdgconfigdirs + \ = xdg#ConfigDirs() +let s:xdgconfighome + \ = xdg#ConfigHome() +let s:xdgdatadirs + \ = xdg#DataDirs() +let s:xdgdatahome + \ = xdg#DataHome() +let s:xdgstatehome + \ = xdg#StateHome() " We put XDG_CONFIG_HOME at the front of the 'runtimepath' list with insert(), " provided it isn't empty, which is what the function returns when the @@ -163,8 +161,7 @@ endif " " Ours not to reason why... " -if exists('s:xdgconfighome') && s:xdgconfighome !=# '' - \ || exists('s:xdgconfigdirs') && !empty(s:xdgconfigdirs) +if s:xdgconfighome !=# '' || !empty(s:xdgconfigdirs) execute 'set runtimepath^='.option#Escape(join(map( \ extend( \ s:xdgconfighome !=# '' ? [s:xdgconfighome] : [], @@ -191,7 +188,7 @@ endif " v8.1.716 introduced a way to set this with an option named 'viminfofile', " but I don't see a reason to use that. " -if exists('s:xdgstatehome') && s:xdgstatehome !=# '' +if s:xdgstatehome !=# '' if !isdirectory(s:xdgstatehome) call mkdir(s:xdgstatehome, 'p', 0700) endif @@ -241,7 +238,7 @@ set history=300 " 'backupfullname', 'swapfilefullname' would have been clearer. " set backup -if exists('s:xdgstatehome') && s:xdgstatehome !=# '' +if s:xdgstatehome !=# '' if !isdirectory(s:xdgstatehome.'/backup') call mkdir(s:xdgstatehome.'/backup', 'p', 0700) endif @@ -302,7 +299,7 @@ endif " its name, in order to avoid filename collisions, since the 'directory' " option has supported that hint for much longer than 'backupdir' has. " -if exists('s:xdgstatehome') && s:xdgstatehome !=# '' +if s:xdgstatehome !=# '' if !isdirectory(s:xdgstatehome.'/swap') call mkdir(s:xdgstatehome.'/swap', 'p', 0700) endif @@ -323,7 +320,7 @@ endif " Support for these persistent undo file caches was not released until v7.3.0, " so we need to check for the feature's presence before we enable it. " -if exists('s:xdgstatehome') && s:xdgstatehome !=# '' && has('persistent_undo') +if s:xdgstatehome !=# '' && has('persistent_undo') set undofile if !isdirectory(s:xdgstatehome.'/undo') call mkdir(s:xdgstatehome.'/undo', 'p', 0700) @@ -338,7 +335,7 @@ endif " directories of this type. This isn't a comma-separated list like the others " ('backupdir', 'directory', 'spell', 'undodir') " -if exists('s:xdgstatehome') && s:xdgstatehome !=# '' && has('mksession') +if s:xdgstatehome !=# '' && has('mksession') if !isdirectory(s:xdgstatehome.'/view') call mkdir(s:xdgstatehome.'/view', 'p', 0700) endif @@ -445,8 +442,7 @@ endif " directory. " set dictionary^=/usr/share/dict/words -if exists('s:xdgdatahome') && s:xdgdatahome !=# '' - \ || exists('s:xdgdatadirs') && !empty(s:xdgdatadirs) +if s:xdgdatahome !=# '' || !empty(s:xdgdatadirs) execute 'set dictionary^='.option#Escape(join(map( \ extend( \ s:xdgdatahome !=# '' ? [s:xdgdatahome] : [], @@ -465,8 +461,7 @@ endif " WordNet and MyThes-1. I had to remove the first two metadata lines from " thesaurus.txt, as Vim appeared to interpret them as part of the body data. " -if exists('s:xdgdatahome') && s:xdgdatahome !=# '' - \ || exists('s:xdgdatadirs') && !empty(s:xdgdatadirs) +if s:xdgdatahome !=# '' || !empty(s:xdgdatadirs) execute 'set thesaurus^='.option#Escape(join(map( \ extend( \ s:xdgdatahome !=# '' ? [s:xdgdatahome] : [], @@ -817,17 +812,6 @@ set splitbelow splitright " set notitle -" Vim has an internal list of terminal types that support using smoother -" terminal redrawing, and for which 'ttyfast' is normally set, described in -" `:help 'ttyfast'`. That list includes most of the terminals I use, but -" there are a couple more for which the 'ttyfast' option should apply: the -" windows terminal emulator PuTTY, and the terminal multiplexer tmux, both of -" which I use heavily. -" -if &term =~# '^putty\|^tmux' - set ttyfast -endif - " We really don't want a mouse; while I use it a lot for cut and paste in X, " it just gets in the way if the tool running in the terminal tries to use it " too. Mouse events should be exclusively handled by the terminal emulator @@ -992,7 +976,7 @@ endif " it. " if &background ==# 'dark' - \ && (has('gui_running') || &t_Co >= 256) + \ && (has('gui_running') || str2nr(&t_Co) >= 256) \ && globpath(&runtimepath, 'colors/sahara.vim') !=# '' colorscheme sahara endif @@ -1073,7 +1057,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. @@ -1132,7 +1116,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) @@ -1169,7 +1153,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) @@ -1256,13 +1240,6 @@ noremap <Leader>w ounmap <Leader>w sunmap <Leader>w -" This next one just shows option state of the 'formatoptions' affecting how -" text is automatically formatted; it doesn't change its value. - -"" Leader,f shows the current 'formatoptions' at a glance -nnoremap <Leader>f - \ :<C-U>set formatoptions?<CR> - " I often have to switch between US English and NZ English. The latter is " almost exactly the same as UK English in most locales, although we use " dollars rather than pounds. This is mostly so I remember things like @@ -1274,6 +1251,17 @@ nnoremap <Leader>z nnoremap <Leader>u \ :<C-U>set spelllang=en_us<CR> +" I've also been trying to learn French lately (2023-04-03), and having +" a spelling check there is handy for doing my homework. +" +" This mapping used to show the state of 'formatoptions', but I haven't been +" using that nearly as often lately. +" +" <https://sanctum.geek.nz/images/ze-cultured-frenchman.png> +" +nnoremap <Leader>f + \ :<C-U>set spelllang=fr<CR> + " The next mapping is also for toggling an option, but it's more complicated; " it uses a simple plugin of mine called copy_linebreak.vim to manage several " options at once, related to the 'wrap' option that soft-wraps text. @@ -1287,7 +1275,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 @@ -1425,11 +1413,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 @@ -1466,7 +1454,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 @@ -1502,10 +1490,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 484e881e..92c53dfb 100644 --- a/vim/vimrc.stub +++ b/vim/vimrc.stub @@ -1,13 +1,12 @@ " We have a big, important decision to make here. " " Check that we're not running in 'compatible' mode, nor that the environment -" calls for the same, that we're running Vim v7.0.0 or newer, and that we -" haven't been invoked as just plain `vi`. If it's all clear, we can load the -" main vimrc file from ~/.vim/vimrc to use Vim in all of its incompatible -" glory, and then stop sourcing the rest of this file. +" calls for the same, and that we're running Vim v7.0.0 or newer. If it's all +" clear, we can load the main vimrc file from ~/.vim/vimrc to use Vim in all +" of its incompatible 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 |