diff options
Diffstat (limited to 'vim')
| -rw-r--r-- | vim/after/ftplugin/python.vim | 35 | ||||
| -rw-r--r-- | vim/after/indent/yaml.vim | 2 | ||||
| -rw-r--r-- | vim/autoload/html/timestamp.vim | 2 | ||||
| -rw-r--r-- | vim/autoload/xdg.vim | 15 | ||||
| m--------- | vim/bundle/copy_linebreak | 0 | ||||
| m--------- | vim/bundle/html_spelllang | 0 | ||||
| m--------- | vim/bundle/redact_pass | 0 | ||||
| m--------- | vim/bundle/spellfile_local | 0 | ||||
| m--------- | vim/bundle/strip_trailing_whitespace | 0 | ||||
| -rw-r--r-- | vim/compiler/pyflakes.vim | 9 | ||||
| -rw-r--r-- | vim/compiler/pylint.vim | 9 | ||||
| -rw-r--r-- | vim/filetype.vim | 148 | ||||
| -rw-r--r-- | vim/ftplugin/textarea.vim | 12 | ||||
| -rw-r--r-- | vim/plugin/matchit.vim | 2 | ||||
| -rw-r--r-- | vim/syntax/jinja2.vim | 2 | ||||
| -rw-r--r-- | vim/vimrc | 632 | ||||
| -rw-r--r-- | vim/vimrc.stub | 21 |
17 files changed, 501 insertions, 388 deletions
diff --git a/vim/after/ftplugin/python.vim b/vim/after/ftplugin/python.vim new file mode 100644 index 00000000..2ca1ae89 --- /dev/null +++ b/vim/after/ftplugin/python.vim @@ -0,0 +1,35 @@ +" 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') + setlocal equalprg=autopep8\ -aaa\ --\ - + let b:undo_ftplugin .= '|setlocal equalprg<' +endif + +" Stop here if the user doesn't want ftplugin mappings +if exists('no_plugin_maps') || exists('no_python_maps') + finish +endif + +" Mappings to choose compiler +nnoremap <buffer> <LocalLeader>c + \ :<C-U>compiler pyflakes<CR> +nnoremap <buffer> <LocalLeader>l + \ :<C-U>compiler pylint<CR> +let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>c' + \ . '|nunmap <buffer> <LocalLeader>l' + +" Mappings to choose 'equalprg' +nnoremap <buffer> <LocalLeader>t + \ :<C-U>setlocal equalprg=autopep8\ -aaa\ --\ -<CR> +nnoremap <buffer> <LocalLeader>i + \ :<C-U>setlocal equalprg<<CR> +let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>t' + \ . '|nunmap <buffer> <LocalLeader>i' diff --git a/vim/after/indent/yaml.vim b/vim/after/indent/yaml.vim new file mode 100644 index 00000000..d0478631 --- /dev/null +++ b/vim/after/indent/yaml.vim @@ -0,0 +1,2 @@ +" Use two (not four!) spaces for indentation, per convention +call indent#Spaces(2) diff --git a/vim/autoload/html/timestamp.vim b/vim/autoload/html/timestamp.vim index 6d525afb..8f250710 100644 --- a/vim/autoload/html/timestamp.vim +++ b/vim/autoload/html/timestamp.vim @@ -34,7 +34,7 @@ function! s:Timestamp(time) abort endfunction " Define timestamp prefix string -let s:prefix = '<strong>Last updated:</strong> ' +let s:prefix = 'Last updated: ' " Define pattern to match date timestamps; no ZALGO, please let s:pattern = '\m\C' diff --git a/vim/autoload/xdg.vim b/vim/autoload/xdg.vim index 67a9c5b2..cb7adcf5 100644 --- a/vim/autoload/xdg.vim +++ b/vim/autoload/xdg.vim @@ -5,6 +5,7 @@ let s:defaults = { \ 'XDG_CONFIG_DIRS': '/etc/xdg', \ 'XDG_DATA_HOME': $HOME.'/.local/share', \ 'XDG_DATA_DIRS': '/usr/local/share:/usr/share', + \ 'XDG_STATE_HOME': $HOME.'/.local/state', \} function! s:Get(name) abort @@ -42,21 +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 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/html_spelllang b/vim/bundle/html_spelllang new file mode 160000 +Subproject 161e47f00cd5a1bdcef61097b7ba100ffd69a48 diff --git a/vim/bundle/redact_pass b/vim/bundle/redact_pass -Subproject 0fa145b0014c57e21eadd251eb69c61c0598a03 +Subproject 403a44dc32533e631384dfcca40d520b9088b0d diff --git a/vim/bundle/spellfile_local b/vim/bundle/spellfile_local -Subproject 0d70cfc626e1b77c7e31b8cdc35f8d3edc507ba +Subproject 6199ee785c6fb964292ec6e82c5b8a0f79e2606 diff --git a/vim/bundle/strip_trailing_whitespace b/vim/bundle/strip_trailing_whitespace -Subproject 90e60095bcfcfeb60bea60ba7f51bbfac3bf469 +Subproject 03782cdaf9db6329665316e1dc2d1b8270714a3 diff --git a/vim/compiler/pyflakes.vim b/vim/compiler/pyflakes.vim new file mode 100644 index 00000000..727fbd76 --- /dev/null +++ b/vim/compiler/pyflakes.vim @@ -0,0 +1,9 @@ +" :compiler support for Python syntax checking with pyflakes +" <https://pypi.org/project/pyflakes/> +if exists('current_compiler') || &compatible || !has('patch-7.4.191') + finish +endif +let current_compiler = 'pyflakes' + +CompilerSet makeprg=pyflakes\ %:S +CompilerSet errorformat=%f:%l:%c:\ %m diff --git a/vim/compiler/pylint.vim b/vim/compiler/pylint.vim new file mode 100644 index 00000000..589f78e3 --- /dev/null +++ b/vim/compiler/pylint.vim @@ -0,0 +1,9 @@ +" :compiler support for Python linting with pylint +" <https://pypi.org/project/pyflakes/> +if exists('current_compiler') || &compatible || !has('patch-7.4.191') + finish +endif +let current_compiler = 'pylint' + +CompilerSet makeprg=pylint\ --output-format=parseable\ --score=n\ %:S +CompilerSet errorformat=%f:%l:\ %m diff --git a/vim/filetype.vim b/vim/filetype.vim index 91cc1ec5..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 @@ -162,6 +184,10 @@ augroup filetypedetect \ ?*.java \,?*.jav \ setfiletype java + " Jinja2 templates + autocmd BufNewFile,BufRead + \ ?*.j2 + \ setfiletype jinja2 " JSON files autocmd BufNewFile,BufRead \ ?*.js @@ -187,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 @@ -220,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 @@ -227,7 +272,7 @@ augroup filetypedetect \,*/muttrc.d/?*.rc \,.muttrc \,muttrc - \,/etc/Muttrc.d/* + \,*/etc/Muttrc.d/* \ setfiletype muttrc " BIND configuration file autocmd BufNewFile,BufRead @@ -253,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 @@ -296,6 +341,9 @@ augroup filetypedetect " Python files autocmd BufNewFile,BufRead \ ?*.py + \,?*.pyw + \,?*.pythonstartup + \,?*.pythonrc \ setfiletype python " Readline configuration file autocmd BufNewFile,BufRead @@ -320,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 @@ -363,12 +421,21 @@ augroup filetypedetect \,.shinit \,.shrc \,.xinitrc - \,/etc/default/* + \,.xprofile + \,.xsession + \,.xsessionrc + \,*/etc/default/* \,configure \,profile \,shinit \,shrc \,xinitrc + \,xprofile + \,xsession + \,xsessionrc + \,*/etc/X11/xinit + \,*/etc/X11/Xreset + \,*/etc/X11/Xsession \ let b:is_posix = 1 \|setfiletype sh " SQL @@ -376,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 @@ -394,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 @@ -409,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 @@ -423,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 @@ -451,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 @@ -503,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 @@ -515,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 diff --git a/vim/syntax/jinja2.vim b/vim/syntax/jinja2.vim new file mode 100644 index 00000000..2b4aef1a --- /dev/null +++ b/vim/syntax/jinja2.vim @@ -0,0 +1,2 @@ +" Django is similar enough to Jinja2 to be useful for highlighting +runtime! syntax/django.vim @@ -1,31 +1,31 @@ -" ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ -" Tom Ryder (tejr)’s Literate Vimrc -" ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ +" ----------------------------------- +" Tom Ryder (tejr)'s Literate Vimrc +" ----------------------------------- " -" Last updated: Thu, 19 Nov 2020 07:55:42 UTC +" Last updated: Fri, 06 May 2022 12:23:48 +0000 " -" │ And I was lifted up in heart, and thought -" │ Of all my late-shown prowess in the lists, -" │ How my strong lance had beaten down the knights, -" │ So many and famous names; and never yet -" │ Had heaven appeared so blue, nor earth so green, -" │ For all my blood danced in me, and I knew -" │ That I should light upon the Holy Grail. +" > And I was lifted up in heart, and thought +" > Of all my late-shown prowess in the lists, +" > How my strong lance had beaten down the knights, +" > So many and famous names; and never yet +" > Had heaven appeared so blue, nor earth so green, +" > For all my blood danced in me, and I knew +" > That I should light upon the Holy Grail. " -" —Tennyson +" ---Tennyson " -" │ your vimrc is better than the bible +" > your vimrc is better than the bible " -" —@polanco@mastodon.sdf.org +" ---@polanco@mastodon.sdf.org " <https://mastodon.sdf.org/@polanco/104069285780040986> " -" This file is an attempt at something like a “literate vimrc”, in the -" tradition of Donald Knuth’s “literate programming”: +" This file is an attempt at something like a "literate vimrc", in the +" tradition of Donald Knuth's "literate programming": " <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 @@ -33,9 +33,9 @@ " " :g/\m^$\|^\s*"/d " -" This file should be saved as ‘vimrc’—note no leading period—in the user +" This file should be saved as `vimrc`---note no leading period---in the user " runtime directory. On GNU/Linux, Mac OS X, and BSD, that directory is -" ‘~/.vim’. On Windows, it’s ‘~/vimfiles’. It requires Vim v7.0.0 or newer, +" `~/.vim`. On Windows, it's `~/vimfiles`. It requires Vim v7.0.0 or newer, " including the +eval feature, and with the 'compatible' option turned off. " That's to allow line continuations. The vimrc stub at ~/.vimrc (Unix) or " ~/_vimrc (Windows) checks that these conditions are met before loading this @@ -45,25 +45,25 @@ " problems with this file. <https://github.com/Kuniwak/vint> " -" We’ll begin by making sure that this file and Vim are speaking the same -" language. Since it’s been the future for a few years now, this file +" We'll begin by making sure that this file and Vim are speaking the same +" language. Since it's been the future for a few years now, this file " indulges in characters outside the ASCII character set. The presence of " such characters prompts Vint to suggest declaring the file encoding with " a :scriptencoding command: " -" │ vim/vimrc:1:1: Use scriptencoding when multibyte char exists (see :help -" │ :scriptencoding) +" > vim/vimrc:1:1: Use scriptencoding when multibyte char exists (see :help +" > :scriptencoding) " " Furthermore, the :help for :scriptencoding specifies that :scriptencoding " should be set *after* 'encoding'. " " Which encoding to use? The answer is the UTF-8 encoding for Unicode, " wherever possible. On POSIX-fearing operating systems, I define the primary -" locale environment variable $LANG to ‘en_NZ.UTF-8’. This informs Vim’s +" locale environment variable $LANG to `en_NZ.UTF-8`. This informs Vim's " choice of internal character encoding. In the absence of such a setting, -" 'encoding' defaults to ‘latin1’ (ISO-8859-1) in most circumstances. Since +" 'encoding' defaults to `latin1` (ISO-8859-1) in most circumstances. Since " this is almost never what I want, even if I haven't said so explicitly by -" exporting $LANG, we’ll fall back to UTF-8 instead. +" exporting $LANG, we'll fall back to UTF-8 instead. " " However, we need to test that the +multi_byte feature is available before " doing any of this, because it was a compile-time feature that wasn't even @@ -79,42 +79,42 @@ if has('multi_byte') scriptencoding utf-8 endif -" With encoding handled, we’ll turn our attention to the value of the +" With encoding handled, we'll turn our attention to the value of the " 'runtimepath' option, since any scripts loaded from the paths specified " therein control so much of the behavior of Vim. We build this path up as -" accurately as possible, accounting for Vim’s unusual escaping behavior for +" accurately as possible, accounting for Vim's unusual escaping behavior for " these list options. " -" One of the first things we’ll need to be able to do is split the value of +" One of the first things we'll need to be able to do is split the value of " 'runtimepath' into its constituent paths. Correctly splitting the values of " comma-separated Vim options is surprisingly complicated. It's not as simple " as just splitting on commas, or even unescaped commas; a more accurate " definition of the delimiter is: " -" │ Any comma not preceded by a backslash, followed by any number of spaces -" │ and commas. +" > Any comma not preceded by a backslash, followed by any number of spaces +" > and commas. " " The pattern we use for the call to split() therefore breaks down like this: " -" \\ ← A literal backslash -" \@<! ← A negative lookbehind assertion; this means that whatever -" occurred before this pattern—in this case, a backslash—cannot -" precede what follows, but anything that *does* precede it is -" considered part of the datum, and not the delimiter. -" , ← A literal comma -" [, ]* ← Any number of commas and spaces +" \\ <- A literal backslash +" \@<! <- A negative lookbehind assertion; this means that whatever +" occurred before this pattern---in this case, a backslash--- +" cannot precede what follows, but anything that *does* precede it +" is considered part of the datum, and not the delimiter. +" , <- A literal comma +" [, ]* <- Any number of commas and spaces " -" We don’t, however, have to deal with backslashes before other backslashes, +" We don't, however, have to deal with backslashes before other backslashes, " nor before any other character. If this seems wrong to you, I encourage you " to read the source code for the ad-hoc tokenizer in copy_option_part() in -" src/misc2.c in Vim’s source code. +" src/misc2.c in Vim's source code. " " Vim, I do love you, but sometimes you're really weird. " " We fold all that mess away into an autoloaded function option#Split(); see " vim/autoload/option.vim. Provided a 'runtimepath' is actually set, using " the list returned from that function, we define an environment variable -" MYVIM—to complement MYVIMRC—for ~/.vim or ~/vimfiles, by retrieving the +" MYVIM---to complement MYVIMRC---for ~/.vim or ~/vimfiles, by retrieving the " first value from the 'runtimepath'. We'll use this later on in the file to " comprehensively match expected paths for vimrc files. " @@ -124,47 +124,44 @@ endif let $MYVIM = option#Split(&runtimepath)[0] " The next components of the runtime directory that we'll set up here will -" make use of the user’s configured XDG base directories: +" make use of the user's configured XDG base directories: " " <https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html#variables> " " Note that this isn't an attempt to shoehorn all of Vim into the XDG mold; " all of this distribution's files are still expected to be installed into -" $MYVIM, per the above. We're just leaning on XDG’s conventions to provide +" $MYVIM, per the above. We're just leaning on XDG's conventions to provide " separate locations for cache files and other configuration. " " We'll start by retrieving the list of valid paths for configuration from " both the XDG_CONFIG_HOME and XDG_CONFIG_DIRS variables, or from their " defaults, using autoloaded xdg# functions. " -if has('unix') - let s:xdgcachehome - \ = xdg#CacheHome() - let s:xdgconfigdirs - \ = xdg#ConfigDirs() - let s:xdgconfighome - \ = xdg#ConfigHome() - let s:xdgdatadirs - \ = xdg#DataDirs() - let s:xdgdatahome - \ = xdg#DataHome() -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 " configured path isn't absolute. This is per the standard's dictum: " -" │ All paths set in these environment variables must be absolute. If an -" │ implementation encounters a relative path in any of these variables it -" │ should consider the path invalid and ignore it. +" > All paths set in these environment variables must be absolute. If an +" > implementation encounters a relative path in any of these variables it +" > should consider the path invalid and ignore it. " -" —XDG Base Directory Specification v0.7 (24th November 2010), "Basics", +" ---XDG Base Directory Specification v0.7 (24th November 2010), "Basics", " <https://specifications.freedesktop.org/basedir-spec/0.7/ar01s02.html> " -" Ours not to reason why… +" 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] : [], @@ -187,16 +184,16 @@ endif " write its own history to the default viminfo path instead. " " This is the portable way to specify the path to the viminfo file, as an -" addendum of the path to the 'viminfo' option with an ‘n’ prefix. Vim +" addendum of the path to the 'viminfo' option with an `n` prefix. Vim " 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:xdgcachehome') && s:xdgcachehome !=# '' - if !isdirectory(s:xdgcachehome) - call mkdir(s:xdgcachehome, 'p', 0700) +if s:xdgstatehome !=# '' + if !isdirectory(s:xdgstatehome) + call mkdir(s:xdgstatehome, 'p', 0700) endif execute 'set viminfo+='.option#Escape( - \ 'n'.s:xdgcachehome.'/viminfo' + \ 'n'.s:xdgstatehome.'/viminfo' \) endif @@ -210,16 +207,16 @@ endif " set history=300 -" We’ll now enable automatic backups of most file buffers, since that’s off by -" default. In practice, I don’t need these backups very much, at least if I’m +" We'll now enable automatic backups of most file buffers, since that's off by +" default. In practice, I don't need these backups very much, at least if I'm " using version control sensibly, but they have still saved my bacon a few " times. " -" We’ll try to keep the backup files in a dedicated cache directory, to stop +" We'll try to keep the backup files in a dedicated cache directory, to stop " them popping up next to the file to which they correspond, and getting " accidentally committed to version control. " -" If Vim is new enough, we’ll add two trailing slashes to the path we’re +" If Vim is new enough, we'll add two trailing slashes to the path we're " inserting, which prompts Vim to incorporate the full escaped path of the " relevant buffer in the backup filename, avoiding collisions. " @@ -227,26 +224,26 @@ set history=300 " this trailing slashes hint for a long time before 'backupdir' caught up to " them. The 'directory' option for swap files has supported it at least as " far back as v5.8.0 (2001), and 'undodir' appears to have supported it since -" its creation in v7.2.438. Even though ‘:help 'backupdir'’ didn’t say so, +" its creation in v7.2.438. Even though `:help 'backupdir'` didn't say so, " people assumed it would work the same way, when in fact Vim simply ignored " it until v8.1.0251. " -" I don’t want to add the slashes to the option value in older versions of Vim -" where they don’t do anything, so we’ll check the version ourselves to see if -" there’s any point in including them. +" I don't want to add the slashes to the option value in older versions of Vim +" where they don't do anything, so we'll check the version ourselves to see if +" there's any point in including them. " " <https://github.com/vim/vim/releases/tag/v8.1.0251> " -" It’s all so awkward. Surely separate options named something like +" It's all so awkward. Surely separate options named something like " 'backupfullname', 'swapfilefullname' would have been clearer. " set backup -if exists('s:xdgcachehome') && s:xdgcachehome !=# '' - if !isdirectory(s:xdgcachehome.'/backup') - call mkdir(s:xdgcachehome.'/backup', 'p', 0700) +if s:xdgstatehome !=# '' + if !isdirectory(s:xdgstatehome.'/backup') + call mkdir(s:xdgstatehome.'/backup', 'p', 0700) endif execute 'set backupdir^='.option#Escape(option#item#Escape( - \ s:xdgcachehome.'/backup'.(patch#('8.1.251') ? '//' : '') + \ s:xdgstatehome.'/backup'.(patch#('8.1.251') ? '//' : '') \)) endif @@ -258,13 +255,13 @@ endif " if has('unix') - " Prior to v8.1.1519, Vim didn’t check patterns added to 'backupskip' for + " Prior to v8.1.1519, Vim didn't check patterns added to 'backupskip' for " uniqueness, so adding the same path repeatedly resulted in duplicate " strings in the value. This was due to the absence of the P_NODUP flag for - " the option’s definition in src/option.c in the Vim source code. If we’re - " using a version older than v8.1.1519, we’ll need to explicitly reset + " the option's definition in src/option.c in the Vim source code. If we're + " using a version older than v8.1.1519, we'll need to explicitly reset " 'backupskip' to its default value before adding patterns to it, so that - " reloading this file doesn’t stack up multiple copies of any added paths. + " reloading this file doesn't stack up multiple copies of any added paths. " " <https://github.com/vim/vim/releases/tag/v8.1.1519> " @@ -273,7 +270,7 @@ if has('unix') endif " Typical temporary file locations - "" RAM disk, default path for password-store’s temporary files + "" RAM disk, default path for password-store's temporary files set backupskip+=/dev/shm/* "" Hard-coded paths for sudoedit set backupskip+=/usr/tmp/*,/var/tmp/* @@ -302,12 +299,12 @@ 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:xdgcachehome') && s:xdgcachehome !=# '' - if !isdirectory(s:xdgcachehome.'/swap') - call mkdir(s:xdgcachehome.'/swap', 'p', 0700) +if s:xdgstatehome !=# '' + if !isdirectory(s:xdgstatehome.'/swap') + call mkdir(s:xdgstatehome.'/swap', 'p', 0700) endif execute 'set directory^='.option#Escape(option#item#Escape( - \ s:xdgcachehome.'/swap//' + \ s:xdgstatehome.'/swap//' \)) endif @@ -318,18 +315,18 @@ endif " The 'undodir' option has the same structure as 'backupdir' and 'directory'; " if we have a user cache directory, create a subdirectory within it dedicated " to the undo files cache. Note also the trailing double-slash as a signal to -" Vim to use the full path of the original file in its undo file cache’s name. +" Vim to use the full path of the original file in its undo file cache's name. " " 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. +" so we need to check for the feature's presence before we enable it. " -if exists('s:xdgcachehome') && s:xdgcachehome !=# '' && has('persistent_undo') +if s:xdgstatehome !=# '' && has('persistent_undo') set undofile - if !isdirectory(s:xdgcachehome.'/undo') - call mkdir(s:xdgcachehome.'/undo', 'p', 0700) + if !isdirectory(s:xdgstatehome.'/undo') + call mkdir(s:xdgstatehome.'/undo', 'p', 0700) endif execute 'set undodir^='.option#Escape(option#item#Escape( - \ s:xdgcachehome.'/undo//' + \ s:xdgstatehome.'/undo//' \)) endif @@ -338,12 +335,12 @@ endif " directories of this type. This isn't a comma-separated list like the others " ('backupdir', 'directory', 'spell', 'undodir') " -if exists('s:xdgcachehome') && s:xdgcachehome !=# '' && has('mksession') - if !isdirectory(s:xdgcachehome.'/view') - call mkdir(s:xdgcachehome.'/view', 'p', 0700) +if s:xdgstatehome !=# '' && has('mksession') + if !isdirectory(s:xdgstatehome.'/view') + call mkdir(s:xdgstatehome.'/view', 'p', 0700) endif execute 'set viewdir='.option#Escape(option#item#Escape( - \ s:xdgcachehome.'/view' + \ s:xdgstatehome.'/view' \)) endif @@ -401,7 +398,7 @@ if exists('##SourceCmd') \ ReloadVimrc endif -" For spelling, use New Zealand English by default, but later on we’ll +" For spelling, use New Zealand English by default, but later on we'll " configure a leader mapping to switch to United States English, since I so " often have to write for Yankees. " @@ -410,11 +407,11 @@ set spelllang=en_nz " Spell checking includes optional support for catching lower case letters at " the start of sentences, and defines a pattern in 'spellcapcheck' for the end " of a sentence. The default is pretty good, but with two-spacing with -" 'cpoptions' including ‘J’ and 'formatoptions' including ‘p’ as set later in +" 'cpoptions' including `J` and 'formatoptions' including `p` as set later in " this file, we can be less ambiguous in this pattern. We require two " consecutive spaces, a newline, a carriage return, or a tab to mark the end -" of a sentence. This means that we could make abbreviations like “i.e. -" something” without flagging “something” as a spelling error. +" of a sentence. This means that we could make abbreviations like "i.e. +" something" without flagging "something" as a spelling error. " set spellcapcheck=[.?!]\\%(\ \ \\\|[\\n\\r\\t]\\) @@ -430,23 +427,22 @@ if exists('+spelloptions') endif " For word completion in insert mode with CTRL-X CTRL-K, or if 'complete' -" includes the ‘k’ flag, the 'dictionary' option specifies the path to the +" includes the `k` flag, the 'dictionary' option specifies the path to the " system word list. This makes the dictionary completion work consistently, -" even if 'spell' isn’t set at the time to coax it into using 'spellfile'. +" even if 'spell' isn't set at the time to coax it into using 'spellfile'. " -" It’s not an error if the system directory file added first doesn’t exist; -" it’s just a common location that often yields a workable word list, and does +" It's not an error if the system directory file added first doesn't exist; +" it's just a common location that often yields a workable word list, and does " so on all of my main machines. " " At some point, I may end up having to set this option along with 'spellfile' " a bit more intelligently to ensure that spell checking and dictionary " function consistently, and with reference to the same resources. For the -" moment, I’ve just added additional entries referring to the user runtime +" moment, I've just added additional entries referring to the user's data " 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] : [], @@ -457,16 +453,15 @@ if exists('s:xdgdatahome') && s:xdgdatahome !=# '' endif " In much the same way as 'dictionary', we add an expected path to -" a thesaurus, for completion with CTRL-X CTRL-T in insert mode, or with ‘t’ -" added to 'completeopt'. The thesaurus data isn’t installed as part of the -" default ‘install-vim’ target in tejr’s dotfiles, but a decent one can be +" a thesaurus, for completion with CTRL-X CTRL-T in insert mode, or with `t` +" added to 'completeopt'. The thesaurus data isn't installed as part of the +" default `install-vim` target in tejr's dotfiles, but a decent one can be " retrieved from my website at <https://sanctum.geek.nz/ref/thesaurus.txt>. -" I got this from the link in the :help for 'thesaurus' in v8.1. It’s from +" I got this from the link in the :help for 'thesaurus' in v8.1. It's from " 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] : [], @@ -476,11 +471,11 @@ if exists('s:xdgdatahome') && s:xdgdatahome !=# '' \), ',')) endif -" Next, we’ll modernize a little in adjusting some options with old +" Next, we'll modernize a little in adjusting some options with old " language-specific defaults. " " Traditional vi was often used for development in the C programming language. -" The default values for a lot of Vim’s options still reflect this common use +" The default values for a lot of Vim's options still reflect this common use " pattern. In this case, the 'comments' and 'commentstring' options reflect " the C syntax for comments: " @@ -495,20 +490,20 @@ endif " " #include "baz.h" " -" Times change, however, and I don’t get to work with C nearly as much as I’d +" Times change, however, and I don't get to work with C nearly as much as I'd " like. The defaults for these options no longer make sense, and so we blank " them, compelling filetype plugins to set them as they need instead. " " The default value for the 'path' option is similar, in that it has an aged " default; this option specifies directories in which project files and -" includes can be unearthed by navigation commands like 'gf'. Specifically, -" its default value comprises /usr/include, which is another C default. Let’s +" includes can be unearthed by navigation commands like `gf`. Specifically, +" its default value comprises /usr/include, which is another C default. Let's " get rid of that, too. " set comments= commentstring= define= include= set path-=/usr/include -" Relax traditional vi’s harsh standards over what regions of the buffer can +" Relax traditional vi's harsh standards over what regions of the buffer can " be removed with backspace in insert mode. While this admittedly allows bad " habits to continue, since insert mode by definition is not really intended " for deleting text, I feel the convenience outweighs that in this case. @@ -518,7 +513,7 @@ set backspace+=indent " Leading whitespace characters created by 'autoindent' set backspace+=start " Text before the start of the current insertion " When soft-wrapping text with the 'wrap' option on, which is off by default, -" break the lines between words, rather than within them; it’s much easier to +" break the lines between words, rather than within them; it's much easier to " read. " set linebreak @@ -531,9 +526,9 @@ set linebreak " … U+2026 HORIZONTAL ELLIPSIS " " Note that we test for the presence of a multi-byte encoding with a special -" feature from ‘:help feature-list’, as recommended by ‘:help encoding’. -" Checking that ‘&encoding ==# 'utf-8'’ is not quite the same thing, though -" it’s unlikely I’ll ever use a different Unicode encoding by choice. +" feature from `:help feature-list`, as recommended by `:help encoding`. +" Checking that `&encoding ==# 'utf-8'` is not quite the same thing, though +" it's unlikely I'll ever use a different Unicode encoding by choice. " if has('multi_byte_encoding') set showbreak=… @@ -543,16 +538,16 @@ endif " The visual structure of code provided by indents breaks down if a lot of the " lines wrap. Ideally, most if not all lines would be kept below 80 -" characters, but in cases where this isn’t possible, soft-wrapping longer +" characters, but in cases where this isn't possible, soft-wrapping longer " lines when 'wrap' is on so that the indent is preserved in the following " line mitigates this breakdown somewhat. " -" With this 'breakindent' option set, it’s particularly important to have +" With this 'breakindent' option set, it's particularly important to have " 'showbreak' set to something besides an empty string, as done above, -" otherwise without line numbers it’s hard to tell what’s a logical line and -" what’s not. +" otherwise without line numbers it's hard to tell what's a logical line and +" what's not. " -" The 'breakindent' option wasn’t added until v7.4.338, so we need to check it +" The 'breakindent' option wasn't added until v7.4.338, so we need to check it " exists before we set it. " " <https://github.com/vim/vim/releases/tag/v7.4.338> @@ -563,18 +558,18 @@ endif " Rather than rejecting operations like :write or :saveas when 'readonly' is " set or in other situations in which data might be lost, Vim should give me -" a prompt to allow me to confirm that I know what I’m doing. +" a prompt to allow me to confirm that I know what I'm doing. " set confirm -" If Vim receives an Escape key code in insert mode, it shouldn’t wait to see -" if it’s going to be followed by another key code, despite this being how the +" If Vim receives an Escape key code in insert mode, it shouldn't wait to see +" if it's going to be followed by another key code, despite this being how the " function keys and Meta/Alt modifier are implemented for many terminal types. -" Otherwise, if I press Escape, there’s an annoying delay before 'showmode' -" stops showing '--INSERT--'. +" Otherwise, if I press Escape, there's an annoying delay before 'showmode' +" stops showing `--INSERT--`. " " This breaks the function keys and the Meta/Alt modifier in insert mode in -" most or maybe all of the terminals I use, but I don’t want those keys in +" most or maybe all of the terminals I use, but I don't want those keys in " insert mode, anyway. All of this works fine in the GUI, of course. " set noesckeys @@ -585,35 +580,35 @@ set noesckeys set foldlevel=256 " Automatic text wrapping options using flags in the 'formatoptions' option -" begin here. I rely on the filetype plugins to set the ‘t’ and ‘c’ flags for +" begin here. I rely on the filetype plugins to set the `t` and `c` flags for " this option to configure whether text or comments should be wrapped, as -" appropriate for the document type or language, and so I don’t mess with +" appropriate for the document type or language, and so I don't mess with " either of those flags here. " If a line is already longer than 'textwidth' would otherwise limit when -" editing of that line begins in insert mode, don’t suddenly automatically -" wrap it; I’ll break it apart myself with a command like ‘gq’. This doesn’t -" seem to stop paragraph reformatting with ‘a’, if that’s set. +" editing of that line begins in insert mode, don't suddenly automatically +" wrap it; I'll break it apart myself with a command like `gq`. This doesn't +" seem to stop paragraph reformatting with `a`, if that's set. " set formatoptions+=l -" Don’t wrap a line in such a way that a single-letter word like “I” or “a” is +" Don't wrap a line in such a way that a single-letter word like "I" or "a" is " at the end of it. Typographically, as far as I can tell, this seems to be -" a stylistic preference rather than a rule, rather like avoiding “widow” and -" “orphan” lines in typesetting. I think it generally looks better to have -" the short word start the line, so we’ll switch it on. +" a stylistic preference rather than a rule, rather like avoiding "widow" and +" "orphan" lines in typesetting. I think it generally looks better to have +" the short word start the line, so we'll switch it on. " set formatoptions+=1 " If the filetype plugins have correctly described what the comment syntax for -" the buffer’s language looks like, it makes sense to use that to figure out +" the buffer's language looks like, it makes sense to use that to figure out " how to join lines within comments without redundant comment syntax cropping -" up. For example, with this set, joining lines in this very comment with ‘J’ -" would remove the leading ‘"’ characters. +" up. For example, with this set, joining lines in this very comment with `J` +" would remove the leading `"` characters. " -" This 'formatoptions' flag wasn’t added until v7.3.541. Because we can’t +" This 'formatoptions' flag wasn't added until v7.3.541. Because we can't " test for the availability of option flags directly, we resort to a version -" number check before attempting to set it. I don’t like using :silent! to +" number check before attempting to set it. I don't like using :silent! to " suppress errors for this sort of thing when I can reasonably avoid it, even " if the tests are somewhat more verbose. " @@ -623,37 +618,37 @@ if patch#('7.3.541') set formatoptions+=j endif -" A momentary digression here into the doldrums of 'cpoptions'—after staunchly -" opposing it for years, I have converted to two-spacing. You can blame Steve -" Losh: +" A momentary digression here into the doldrums of 'cpoptions'---after +" staunchly opposing it for years, I have converted to two-spacing. You can +" blame Steve Losh: " " <http://stevelosh.com/blog/2012/10/why-i-two-space/> " -" Consequently, we specify that sentence objects for the purposes of the ‘s’ -" text object, the ‘(’ and ‘)’ sentence motions, and formatting with the 'gq' +" Consequently, we specify that sentence objects for the purposes of the `s` +" text object, the `(` and `)` sentence motions, and formatting with the 'gq' " command must be separated by *two* spaces. One space does not suffice. " " My defection to the two-spacers is also the reason I now leave 'joinspaces' " set, per its default, so that two spaces are inserted when consecutive -" sentences separated by a line break are joined onto one line by the ‘J’ +" sentences separated by a line break are joined onto one line by the `J` " command. " set cpoptions+=J " Separating sentences with two spaces has an advantage in making a clear " distinction between two different types of periods: periods that abbreviate -" longer words, as in “Mr. Moolenaar”, and periods that terminate sentences, +" longer words, as in "Mr. Moolenaar", and periods that terminate sentences, " like this one. " -" If we’re using two-period spacing for sentences, Vim can interpret the +" If we're using two-period spacing for sentences, Vim can interpret the " different spacing to distinguish between the two types, and can thereby " avoid breaking a line just after an abbreviating period. For example, the -" two words in “Mr. Moolenaar” should never be split apart, lest the -" abbreviation “Mr.” look too much like the end of a sentence. This also +" two words in "Mr. Moolenaar" should never be split apart, lest the +" abbreviation "Mr." look too much like the end of a sentence. This also " preserves the semantics of that same period for subsequent reformatting; its -" single-space won’t get lost. +" single-space won't get lost. " -" So, getting back to our 'formatoptions' settings, that is what the ‘p’ flag +" So, getting back to our 'formatoptions' settings, that is what the `p` flag " does. I wrote the patch that added it, after becoming envious of an " analogous feature during an ill-fated foray into GNU Emacs usage. " @@ -665,9 +660,9 @@ endif " In an effort to avoid loading unnecessary files, we add a flag to the " 'guioptions' option to prevent the menu.vim runtime file from being loaded. -" It doesn’t do any harm, but I never use it, and it’s easy to turn it off. +" It doesn't do any harm, but I never use it, and it's easy to turn it off. " -" The documentation for this flag in ‘:help 'go-M'’ includes a note saying the +" The documentation for this flag in `:help 'go-M'` includes a note saying the " flag should be set here, rather that in the GUI-specific gvimrc file, as one " might otherwise think. " @@ -675,19 +670,19 @@ if has('gui_running') set guioptions+=M endif -" By default, Vim doesn’t allow a file buffer to have unwritten changes if -" it’s not displayed in a window. Setting this option removes that +" By default, Vim doesn't allow a file buffer to have unwritten changes if +" it's not displayed in a window. Setting this option removes that " restriction so that buffers can remain in a modified state while not " actually displayed anywhere. " -" This option is set in almost every vimrc I read; it’s so pervasive that -" I sometimes see comments expressing astonishment or annoyance that it isn’t -" set by default. However, I didn’t actually need this option for several +" This option is set in almost every vimrc I read; it's so pervasive that +" I sometimes see comments expressing astonishment or annoyance that it isn't +" set by default. However, I didn't actually need this option for several " years of Vim usage, because I instinctively close windows onto buffers only " after the buffers within them have been written anyway. " " However, the option really is required for batch operations performed with -" commands like :argdo or :bufdo, because Vim won’t otherwise tolerate +" commands like :argdo or :bufdo, because Vim won't otherwise tolerate " unwritten changes to a litany of buffers that are not displayed in any " window. After I started using such command maps a bit more often, " I realized I finally had a reason to turn this on permanently. @@ -702,16 +697,16 @@ set hidden set hlsearch nohlsearch -" Highlight search matches in my text while I’m still typing my pattern, +" Highlight search matches in my text while I'm still typing my pattern, " including scrolling the screen to show the first such match if necessary. " This can be somewhat jarring, particularly when the cursor ends up scrolling " a long way from home in a large file, but I think the benefits of being able -" to see instances of what I’m trying to match as I type the pattern do +" to see instances of what I'm trying to match as I type the pattern do " outweigh that discomfort. " set incsearch -" Don’t waste cycles and bandwidth redrawing the screen during execution of +" Don't waste cycles and bandwidth redrawing the screen during execution of " macro recordings and scripts. " set lazyredraw @@ -728,19 +723,19 @@ set listchars+=trail:- " Trailing spaces set listchars+=nbsp:+ " Non-breaking spaces " The next pair of 'list' characters are arguably somewhat misplaced, in that -" they don’t really represent invisible characters in the same way as the +" they don't really represent invisible characters in the same way as the " others, but are hints for the presence of other characters on unwrapped -" lines that are wider than the screen. They’re very useful, though. +" lines that are wider than the screen. They're very useful, though. " " If the current encoding supports it, use these non-ASCII characters for the -" markers, as they’re visually distinctive: +" markers, as they're visually distinctive: " " extends: Signals presence of unwrapped text to screen right " » U+00BB RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK " precedes: Signals presence of unwrapped text to screen left " « U+00BB LEFT-POINTING DOUBLE ANGLE QUOTATION MARK " -" Failing that, ‘<’ and ‘>’ will do the trick. +" Failing that, `<` and `>` will do the trick. " if has('multi_byte_encoding') set listchars+=extends:»,precedes:« @@ -748,19 +743,19 @@ else set listchars+=extends:>,precedes:< endif -" Don’t let your editor’s options be configured by content in arbitrary files! -" Down with modelines! Purge them from your files! Écrasez l’infâme! +" Don't let your editor's options be configured by content in arbitrary files! +" Down with modelines! Purge them from your files! Écrasez l'infâme! " -" I think that modelines are Vim’s worst misfeature, and that 'nomodeline' -" should be the default. It’s enabled pretty bad security vulnerabilities -" over the years, and it’s a lot more effective to use filetype detection, +" I think that modelines are Vim's worst misfeature, and that 'nomodeline' +" should be the default. It's enabled pretty bad security vulnerabilities +" over the years, and it's a lot more effective to use filetype detection, " other automatic command hooks, or methods like .editorconfig to set " variables specifically for a buffer or project. " set nomodeline " The only octal numbers I can think of that I ever even encounter are Unix -" permissions masks, and I’d never use CTRL-A or CTRL-X to increment them. +" permissions masks, and I'd never use CTRL-A or CTRL-X to increment them. " Numbers with leading zeroes are far more likely to be decimals. " set nrformats-=octal @@ -776,7 +771,7 @@ set nrformats-=octal set noruler " Sessions preserve window, tab, and buffer layout, and are thereby great for -" more complex and longer-term projects like books, but they don’t play +" more complex and longer-term projects like books, but they don't play " together well with plugins and filetype plugins. Restoring the same " settings from both reloaded plugins and from the session causes screeds of " errors. Adjusting session behavior to stop it trying to restore the sorts @@ -785,65 +780,60 @@ set noruler set sessionoptions-=localoptions " No buffer options or mappings set sessionoptions-=options " No global options or mappings -" Turn 'showcmd' off if a system vimrc has been rude enough to set it; I don’t +" Turn 'showcmd' off if a system vimrc has been rude enough to set it; I don't " like how it can interfere with the display of longer lines. " set noshowcmd -" The ‘I’ flag for the 'shortmess' option prevents the display of the Vim +" The `I` flag for the 'shortmess' option prevents the display of the Vim " startup screen with version information, :help hints, and donation -" suggestion. After I registered Vim and donated to Uganda per the screen’s -" plea, I didn’t feel bad about turning this off anymore. Even with this -" setting in place, I wouldn’t normally see it too often anyway, as I seldom +" suggestion. After I registered Vim and donated to Uganda per the screen's +" plea, I didn't feel bad about turning this off anymore. Even with this +" setting in place, I wouldn't normally see it too often anyway, as I seldom " start Vim with no file arguments. " -" I haven’t felt the need to mess with the other flags in this option. -" I don’t have any problems with spurious Enter prompts, which seems to be the +" I haven't felt the need to mess with the other flags in this option. +" I don't have any problems with spurious Enter prompts, which seems to be the " main reason people pile it full of letters. " set shortmess+=I " I find the defaults of new windows opening above or to the left of the -" previous window too jarring, because I’m used to both the i3 window manager +" previous window too jarring, because I'm used to both the i3 window manager " and the tmux terminal multiplexer doing it the other way around, in reading " order. I prefer the visual effect of the previous text staying where it is, " and the new window occupying previously blank space. " set splitbelow splitright -" 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. +" I don't like the titles of my terminal windows being changed, especially +" when changing them back doesn't actually work. Just leave them alone, Vim, +" even if you think you can handle it. " -if &term =~# '^putty\|^tmux' - set ttyfast -endif +set notitle -" We really don’t want a mouse; while I use it a lot for cut and paste in X, +" 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 -" application, so Vim shouldn’t try to give me terminal mouse support, even if +" application, so Vim shouldn't try to give me terminal mouse support, even if " it would work. " " The manual suggests that disabling this should be done by clearing 't_RV', -" but that didn’t actually seem to work when I tried it. +" but that didn't actually seem to work when I tried it. " set ttymouse= " While using virtual block mode, allow me to navigate to any column of the -" buffer window; don’t confine the boundaries of the block to the coordinates +" buffer window; don't confine the boundaries of the block to the coordinates " of characters that actually exist in the buffer text. While working with -" formatted columnar data with this off is generally OK, it’s a hassle for +" formatted columnar data with this off is generally OK, it's a hassle for " more subtle applications of visual block mode. " set virtualedit+=block -" I can’t recall a time that Vim’s error beeping or flashing was actually +" I can't recall a time that Vim's error beeping or flashing was actually " useful to me, and so we turn it off in the manner that the manual instructs -" in ‘:help 'visualbell'’. This enables visual rather than audio error bells, +" in `:help 'visualbell'`. This enables visual rather than audio error bells, " but in the same breath, blanks the terminal attribute that would be used to " trigger such screen blinking, indirectly disabling the bell altogether. " @@ -862,7 +852,7 @@ set visualbell t_vb= " " The default value of 'full' for the 'wildmode' option puts the full " completion onto the line immediately, which I tolerate for insert mode -" completion but don’t really like on the Ex command line. Instead, I arrange +" completion but don't really like on the Ex command line. Instead, I arrange " for that to happen only with a second key press. " set wildmenu @@ -870,7 +860,7 @@ set wildmode=list:longest,full " Define a list of patterns to ignore for file and directory command line " completion. Files and directories with names matching any of these patterns -" won’t be presented as candidates for tab completion on the command line. +" won't be presented as candidates for tab completion on the command line. " " To make this list, I went right through my home directory with " a `find`-toothed comb; counted the occurrences of every extension, forced @@ -879,7 +869,7 @@ set wildmode=list:longest,full " " The following incantation does the trick with POSIX-compatible shell tools, " giving patterns for the top 100 alphanumeric extensions for files from the -" running user’s home directory: +" running user's home directory: " " $ (LC_ALL=C ; find "$HOME" ! -type d -name '*.?*' -exec \ " sh -c 'for fn ; do @@ -894,9 +884,9 @@ set wildmode=list:longest,full " " I turned out to have rather a lot of .html and .vim files. " -" If you’re scoffing at that and thinking “I could write a much simpler one,” +" If you're scoffing at that and thinking "I could write a much simpler one," " please do so, and send it to me at <tom@sanctum.geek.nz> to have yours put -" in here instead, with appropriate credit. Don’t forget to handle more than +" in here instead, with appropriate credit. Don't forget to handle more than " ARG_MAX files, include filenames with newlines, and that the -z or -0 null " separator extensions are not standardized in POSIX. " @@ -912,12 +902,12 @@ set wildignore=*~,#*#,*.7z,.DS_Store,.git,.hg,.svn,*.a,*.adf,*.asc,*.au,*.aup " Allow me to type a path to complete on the Ex command line in all-lowercase, " and transform the consequent completion to match the appropriate case, like -" the Readline setting ‘completion-ignore-case’ can be used for GNU Bash. +" the Readline setting `completion-ignore-case` can be used for GNU Bash. " " When completing filenames on the command line, choose completions without " regard to case, allowing me the ease of typing a partial path in " all-lowercase. This is very similar to the Readline setting -" ‘completion-ignore-case’ used for Bash. +" `completion-ignore-case` used for Bash. " " The 'wildignorecase' option is not related to the similarly-named " 'wildignore' option, nor to the +wildmenu feature. @@ -931,7 +921,7 @@ if exists('+wildignorecase') set wildignorecase endif -" Enable syntax highlighting, but only if it’s not already on, to save +" Enable syntax highlighting, but only if it's not already on, to save " reloading the syntax files unnecessarily. " " <https://sanctum.geek.nz/blinkenlights/syntax-on.jpg> @@ -939,41 +929,41 @@ endif " For several months in 2018, as an experiment, I tried using terminals with " no color at all, imitating a phenomenally productive BSD purist co-worker " who abhorred color in any form on his terminals. He only drank black -" coffee, too. If you’re reading this: Hello, bdh! +" coffee, too. If you're reading this: Hello, bdh! " " That experiment was instructive and interesting, and I found I had been " leaning on color information in some surprising ways. However, some months " later, I found I still missed my colors, and so I went back to my -" Kodachrome roots, and didn’t pine at all for that monochrome world. +" Kodachrome roots, and didn't pine at all for that monochrome world. " " The thing I most like about syntax highlighting is detecting runaway " strings, which generally works in even the most threadbare language syntax -" highlighting definitions. I kept missing such errors when I didn’t have the -" colors. I don’t have high standards for it otherwise, except maybe for +" highlighting definitions. I kept missing such errors when I didn't have the +" colors. I don't have high standards for it otherwise, except maybe for " shell script. " if !exists('syntax_on') syntax enable endif -" Before we attempt to pick a syntax highlighting color scheme, we’ll set up +" Before we attempt to pick a syntax highlighting color scheme, we'll set up " a couple of hooks for color scheme loading. In this case, we turn -" 'cursorline' on if my 'sahara' color scheme is loaded, since I’ve configured -" it to be a very dark gray that doesn’t stand out too much against a black +" 'cursorline' on if my 'sahara' color scheme is loaded, since I've configured +" it to be a very dark gray that doesn't stand out too much against a black " background. For any other color scheme, turn the option off, because it " almost always stands out too much for my liking. " -" You’d think the pattern here could be used to match the color scheme name, -" and it can be—after patch v7.4.108, when Christian Brabandt fixed it. Until -" that version, it matched against the current buffer name, so we’re forced to -" have an explicit test in the command instead. +" You'd think the pattern here could be used to match the color scheme name, +" and it can be---after patch v7.4.108, when Christian Brabandt fixed it. +" Until that version, it matched against the current buffer name, so we're +" forced to have an explicit test in the command instead. " " <https://github.com/vim/vim/releases/tag/v7.4.108> " autocmd vimrc ColorScheme * \ call colorscheme#UpdateCursorline(g:colors_name, ['sahara']) -" Use 'dark' as my default value for 'background', in the absence of an +" Use `dark` as my default value for 'background', in the absence of an " environment variable COLORFGBG or a response in v:termrbgresp that would set " it specifically. " @@ -986,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 @@ -1007,33 +997,33 @@ endif " use selection mode directly. " " * Avoid mapping in insert mode; let characters be literal to the greatest -" extent possible, and avoid “doing more” in insert mode besides merely -" inserting text as it’s typed. +" extent possible, and avoid "doing more" in insert mode besides merely +" inserting text as it's typed. " " * Avoid key chords with CTRL in favor of leader keys. " " * Never use Alt/Meta key chords; the terminal support for them is just too " confusing and flaky. " -" * Don’t suppress display of mapped commands for no reason; it’s OK to show -" the user the command that’s being run under the hood. Do avoid HIT-ENTER +" * Don't suppress display of mapped commands for no reason; it's OK to show +" the user the command that's being run under the hood. Do avoid HIT-ENTER " prompts, though. " -" * Avoid shadowing any of Vim’s existing functionality. If possible, extend +" * Avoid shadowing any of Vim's existing functionality. If possible, extend " or supplement what Vim does, rather than replacing it. " -" We’ll start with the non-leader mappings. Ideally, there shouldn’t be too +" We'll start with the non-leader mappings. Ideally, there shouldn't be too " many of these. " -" Use backspace as an even quicker way to switch to the current buffer’s +" Use backspace as an even quicker way to switch to the current buffer's " alternate buffer. User nickspoons of #vim was incredulous that I had never " used CTRL-^ and indeed did not know about it. I have since repented. " nnoremap <Backspace> \ <C-^> -" I find the space bar’s default behavior in normal mode of moving right one +" I find the space bar's default behavior in normal mode of moving right one " character to be useless. Instead, I remap it to be a lazy way of paging " through the argument list buffers, scrolling a page until the last line of " the buffer is visible, and then moving to the :next buffer. @@ -1045,10 +1035,10 @@ nnoremap <expr> <Space> \ ? "\<PageDown>" \ : ":\<C-U>next\<CR>" -" I often can’t remember (or guess) digraph codes, and want to look up how to +" I often can't remember (or guess) digraph codes, and want to look up how to " compose a specific character that I can name, at least in part. The table -" in ‘:help digraph-table’ is what to use for that situation, and it solves -" the problem, but I didn’t like the overhead of repeated lookups therein. +" in `:help digraph-table` is what to use for that situation, and it solves +" the problem, but I didn't like the overhead of repeated lookups therein. " " Steve Losh has a solution I liked where a double-tap of CTRL-K in insert " mode brought up the applicable :help window: @@ -1067,13 +1057,13 @@ 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. +" type the digraph that you've hopefully found. " -" Since a double-tap of CTRL-K does nothing in default Vim, we don’t bother -" checking that the plugin’s available before we map to it; it’ll just quietly +" Since a double-tap of CTRL-K does nothing in default Vim, we don't bother +" checking that the plugin's available before we map to it; it'll just quietly " do nothing. " imap <C-K><C-K> @@ -1083,56 +1073,56 @@ imap <C-K><C-K> " and tools like Mutt and Vim pretty often. It feels natural to me to stack " issuing a :nohlsearch command to stop highlighting searches on top of this. " -" This gets by far the most use in normal mode, but I’d like it to work in -" insert and visual modes, too, where it’s occasionally useful, especially on +" This gets by far the most use in normal mode, but I'd like it to work in +" insert and visual modes, too, where it's occasionally useful, especially on " things like mobile phone terminal emulators that can be choppy and require " a lot of redrawing. " " For each of these, we end the mapping with a CTRL-L in normal mode, thereby -" extending rather than replacing Vim’s normal behavior. +" extending rather than replacing Vim's normal behavior. " nnoremap <C-L> \ :<C-U>nohlsearch<CR><C-L> " The insert mode wrapper for normal CTRL-L uses i_CTRL-O to issue a single -" normal mode command. We intentionally use ‘:normal’ rather than ‘:normal!’ +" normal mode command. We intentionally use `:normal` rather than `:normal!` " so that the mapping works recursively. I tried using <C-O><C-L> with :imap -" for this, but it didn’t work. Maybe i_CTRL-O doesn’t respect mappings. -" I couldn’t find any documentation about it. +" for this, but it didn't work. Maybe i_CTRL-O doesn't respect mappings. +" I couldn't find any documentation about it. " inoremap <C-L> \ <C-O>:execute "normal \<C-L>"<CR> " We use :vmap here rather than :xmap to have the mapping applied for select -" mode as well as visual mode. This is because CTRL-L doesn’t reflect +" mode as well as visual mode. This is because CTRL-L doesn't reflect " a printable character, and so we don't shadow anything by making it work, -" even though I don’t actually use select mode directly very much. +" even though I don't actually use select mode directly very much. " vmap <C-L> \ <Esc><C-L>gv -" By default, the very-useful normal mode command ‘&’ that repeats the -" previous :substitute command doesn’t preserve the flags from that -" substitution. I’d prefer it to do so, like the :&& command does, and it’s -" easily remapped for both normal and visual mode, so let’s just do it. +" By default, the very-useful normal mode command `&` that repeats the +" previous :substitute command doesn't preserve the flags from that +" substitution. I'd prefer it to do so, like the :&& command does, and it's +" easily remapped for both normal and visual mode, so let's just do it. " noremap & \ :&&<CR> ounmap & sunmap & -" I really like using the ‘!’ command in normal mode as an operator to filter +" I really like using the `!` command in normal mode as an operator to filter " text through a shell command. It always bugged me a little that there -" didn’t seem to be an analogue for a motion to filter text through an +" 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) -" I used Tim Pope’s unimpaired.vim plugin for ages, and I liked some of these -" bracket pair mappings, so I’ve carried a few of the simpler ones over. All +" I used Tim Pope's unimpaired.vim plugin for ages, and I liked some of these +" bracket pair mappings, so I've carried a few of the simpler ones over. All " of these can be prefixed with a count if needed, too. I use all of them " pretty regularly, even though cycling through lists to look for something " can be a bit wasteful. @@ -1158,26 +1148,26 @@ nnoremap [l nnoremap ]l \ :lnext<CR> -" Here’s another mapping I particularly liked from unimpaired.vim; insert +" Here's another mapping I particularly liked from unimpaired.vim; insert " blank lines from normal mode, using a custom plugin of mine called -" put_blank_lines.vim. These use operator functions so that they’re +" 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) nmap ]<Space> \ <Plug>(PutBlankLinesBelow) -" We’re on to the leader maps, now. It’s difficult to know in what order to +" We're on to the leader maps, now. It's difficult to know in what order to " describe and specify these. I used to have them in alphabetical order, but " it seems much more useful to group them by the type of action they take. " -" First of all, let’s set the leader keys; backslash happens to be the -" default, but I like to make my choice explicit here. As of 2019, I’m still +" First of all, let's set the leader keys; backslash happens to be the +" default, but I like to make my choice explicit here. As of 2019, I'm still " not certain that comma is the best choice for my local leader. I use it all -" the time for this purpose, and it works well, but I don’t much like that it +" the time for this purpose, and it works well, but I don't much like that it " shadows a useful function in the fFtT;, group, and I sometimes wonder if " I would use the key for its original function more, had I not shadowed it. " @@ -1194,20 +1184,20 @@ if maplocalleader ==# ',' sunmap ,, endif -" Let’s start with some simple ones; these ones all just toggle a boolean -" option, and print its new value. They’re dirt simple to specify, and don’t +" Let's start with some simple ones; these ones all just toggle a boolean +" option, and print its new value. They're dirt simple to specify, and don't " require any plugins. " -" These are sometimes applicable in visual mode, and sometimes not. We’ll +" These are sometimes applicable in visual mode, and sometimes not. We'll " start with the ones that only make sense as normal mode maps. Annoyingly, -" a visual mode mapping for 'cursorline' toggling doesn’t work at all; +" a visual mode mapping for 'cursorline' toggling doesn't work at all; " 'cursorline' is always off when in any visual mode, including block mode, " where it actually might have been really handy. "" Leader,TAB toggles automatic indentation based on the previous line nnoremap <Leader><Tab> \ :<C-U>set autoindent! autoindent?<CR> -"" Leader,c toggles highlighted cursor row; doesn’t work in visual mode +"" Leader,c toggles highlighted cursor row; doesn't work in visual mode nnoremap <Leader>c \ :<C-U>set cursorline! cursorline?<CR> "" Leader,h toggles highlighting search results @@ -1250,17 +1240,10 @@ 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 -" excluding or including the ‘u’ in words like ‘favourite’, depending on the +" excluding or including the `u` in words like `favourite`, depending on the " target audience. I generally use US English for international audiences. " nnoremap <Leader>z @@ -1268,20 +1251,31 @@ nnoremap <Leader>z nnoremap <Leader>u \ :<C-U>set spelllang=en_us<CR> -" The next mapping is also for toggling an option, but it’s more complicated; +" 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. " -" It’s designed for usage in terminal emulators and multiplexers to +" It's designed for usage in terminal emulators and multiplexers to " temporarily make the buffer text suitable for copying in such a way that the -" wrapping and any associated soft formatting won’t pervert the text, +" wrapping and any associated soft formatting won't pervert the text, " including 'breakindent', 'linebreak', and 'showbreak' artifacts. " " This is really handy for quick selections of small regions of text. For " 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 @@ -1289,13 +1283,13 @@ nmap <Leader>b \ <Plug>(CopyLinebreakToggle) " The above mappings show that mappings for toggling boolean options are -" simple, but there isn’t a way to toggle single flags within option strings +" simple, but there isn't a way to toggle single flags within option strings " with just the :set command, so I wrote a plugin called toggle_flags.vim to " provide :ToggleFlag and :ToggleFlagLocal commands. The first argument is " the name of an option, and the second is the flag within it that should be " toggled on or off. -"" Leader,a toggles 'formatoptions' ‘a’ auto-flowing flag +"" Leader,a toggles 'formatoptions' `a` auto-flowing flag nnoremap <Leader>a \ :<C-U>ToggleFlagLocal formatoptions a<CR> "" Leader,L toggles 'colorcolumn' showing the first column beyond 'textwidth' @@ -1305,9 +1299,9 @@ ounmap <Leader>L sunmap <Leader>L " This mapping uses my paste_insert.vim plugin to queue up automatic commands -" for the next insert operation. It’s still pretty new. It replaces my old +" for the next insert operation. It's still pretty new. It replaces my old " paste_open.vim plugin which did this only for opening new lines, and which -" kept confusing me. I’m hoping this will be better. +" kept confusing me. I'm hoping this will be better. "" Leader,p prepares the next insert for paste mode nmap <Leader>p @@ -1340,17 +1334,17 @@ nnoremap <Leader>D " This group contains mappings that are to do with file and path management " relative to the current buffer. -"" Leader,g shows the current file’s fully expanded path +"" Leader,g shows the current file's fully expanded path nnoremap <Leader>g \ :<C-U>echo expand('%:p')<CR> -"" Leader,G changes directory to the current file’s location +"" Leader,G changes directory to the current file's location nnoremap <Leader>G \ :<C-U>cd %:h <Bar> pwd<CR> -"" Leader,P creates the path to the current file if it doesn’t exist +"" Leader,P creates the path to the current file if it doesn't exist nnoremap <Leader>P \ :<C-U>call mkdir(expand('%:h'), 'p')<CR> -" This group contains mappings that show information about Vim’s internals: +" This group contains mappings that show information about Vim's internals: " marks, registers, variables, and the like. "" Leader,H shows command history @@ -1385,8 +1379,8 @@ nnoremap <Leader>y \ :<C-U>registers<CR> " This group contains mappings concerned with buffer navigation and -" management. I use the “jetpack” buffer jumper one a lot. I got it from one -" of bairui’s “Vim and Vigor” comics: +" management. I use the "jetpack" buffer jumper one a lot. I got it from one +" of bairui's "Vim and Vigor" comics: " " <http://of-vim-and-vigor.blogspot.com/p/vim-vigor-comic.html> @@ -1402,12 +1396,12 @@ nnoremap <Leader>e "" Leader,E locks a buffer, reversible with <Leader>e nnoremap <Leader>E \ :<C-U>set nomodifiable readonly<CR> -"" Leader,j jumps to buffers—the “jetpack” +"" Leader,j jumps to buffers---the "jetpack" nnoremap <Leader>j \ :<C-U>buffers<CR>:buffer<Space> " Leader,o hacks up the list of old files from viminfo just long enough to -" ensure that :browse :oldfiles fits in a screen, avoiding an Enter or ‘q’ +" ensure that :browse :oldfiles fits in a screen, avoiding an Enter or `q` " keystroke before entering the number. This one is handy followed by " <Leader>,\ to jump back to the last remembered position in that file, since " by definition viminfo remembers that mark, too. @@ -1419,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 @@ -1445,7 +1439,7 @@ nnoremap <Leader>+ \ :<C-U>KeepPosition execute 'normal! 1GgqG'<CR> " This group defines a few :onoremap commands to make my own text objects. -" I should probably make some more of these, as they’ve proven to be +" I should probably make some more of these, as they've proven to be " terrifically handy. "" Leader,_ uses last changed or yanked text as an object @@ -1460,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 @@ -1470,7 +1464,7 @@ sunmap <Leader>{ map <Leader>} \ <Plug>(VerticalRegionDown) sunmap <Leader>} -"" Leader,\ jumps to the last edit position mark; think “Now, where was I?” +"" Leader,\ jumps to the last edit position mark; think "Now, where was I?" noremap <Leader>\ \ `" sunmap <Leader>\ @@ -1492,14 +1486,14 @@ nnoremap <Leader>/ nnoremap <Leader>? \ :<C-U>lhelpgrep \c<S-Left> -" This group contains miscellaneous mappings for which I couldn’t find any +" This group contains miscellaneous mappings for which I couldn't find any " 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 @@ -1552,17 +1546,17 @@ nnoremap <Leader>~ " digraphs zs 8203 -" And last, but definitely not least, I’m required by Vim fanatic law to +" And last, but definitely not least, I'm required by Vim fanatic law to " include a mapping that reloads my whole configuration. This uses the " command wrapper defined much earlier in the file, so that filetypes also get -" reloaded afterwards, meaning I don’t need to follow <Leader>R with +" reloaded afterwards, meaning I don't need to follow <Leader>R with " a <Leader>F to fix up broken global settings. " nnoremap <Leader>R \ :<C-U>ReloadVimrc<CR> -" I’ll close this file with a few abbreviations. Perhaps of everything in -" here, I’m least confident that these should be in here, but they’ve proven +" I'll close this file with a few abbreviations. Perhaps of everything in +" here, I'm least confident that these should be in here, but they've proven " pretty useful. First, some 'deliberate' abbreviations for stuff I type " a lot: " @@ -1591,10 +1585,10 @@ inoreabbrev THere " Here endeth the literate vimrc. Let us praise God. " -" │ Consequently, it is soon recognized that they write for the sake of -" │ filling up the paper, and this is the case sometimes with the best -" │ authors…as soon as this is perceived the book should be thrown away, -" │ for time is precious. -" │ -" │ —Schopenhauer +" > Consequently, it is soon recognized that they write for the sake of +" > filling up the paper, and this is the case sometimes with the best +" > authors...as soon as this is perceived the book should be thrown away, +" > for time is precious. +" > +" > ---Schopenhauer " diff --git a/vim/vimrc.stub b/vim/vimrc.stub index f9ad4d4f..92c53dfb 100644 --- a/vim/vimrc.stub +++ b/vim/vimrc.stub @@ -1,26 +1,25 @@ " 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. +" Check that we're not running in 'compatible' mode, nor that the environment +" 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 endif -" If we got this far, it means we’re running a tiny, 'compatible', and/or +" If we got this far, it means we're running a tiny, 'compatible', and/or " ancient version of Vim. " " So, strip out the user runtime directories from 'runtimepath', force -" 'compatible' on, source your trusty ‘~/.exrc’, put on your dubbed cassette -" copy of Kraftwerk’s ‘Computerwelt’, and start using vi v3.7 on your -" engineering department’s Sun OS 4.x server via your VT220 terminal. It’s -" July 1985, you write K&R C, and it’s good for you, like raisin bran. +" 'compatible' on, source your trusty '~/.exrc', put on your dubbed cassette +" copy of Kraftwerk's 'Computerwelt', and start using vi v3.7 on your +" engineering department's Sun OS 4.x server via your VT220 terminal. It's +" July 1985, you write K&R C, and it's good for you, like raisin bran. " set runtimepath-=~/.vim set runtimepath-=~/.vim/after |