aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Exclude SC1090 (failed source) shellcheck errorTom Ryder2017-11-121-3/+3
| | | | | | This error seems to be raised when ShellCheck can't source a file because its filename is not known until runtime. I don't want it to do that anyway, so I've just excluded it by default.
* Move lots of local Vim config into vim/afterTom Ryder2017-11-1243-305/+434
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a relatively drastic change that should have been done progressively, but I got carried away in ripping everything out and putting it back in again. Reading the documentation for writing a Vim script (:help usr_41.txt), I am convinced that all of the content that was in the vim/ftplugin directory and some of the vim/indent directory actually belonged in vim/after/ftplugin and vim/after/indent respectively. This is because the section on filetypes makes the distinction between replacing the core filetype or indent plugins and merely adding to or editing them after the fact; from :help ftplugin: > If you do want to use the default plugin, but overrule one of the > settings, you can write the different setting in a script: > > setlocal textwidth=70 > > Now write this in the "after" directory, so that it gets sourced after > the distributed "vim.vim" ftplugin after-directory. For Unix this > would be "~/.vim/after/ftplugin/vim.vim". Note that the default > plugin will have set "b:did_ftplugin", but it is ignored here. Therefore, I have deleted the user_indent.vim and user_ftplugin.vim plugins and their documentation that I wrote, and their ftplugin.vim and indent.vim shims in ~/.vim, in an attempt to make these plugins elegantly undo-ready, and instead embraced the way the documentation and $VIMRUNTIME structure seems to suggest. I broke the ftplugin files up by function and put them under subdirectories of vim/after named by filetype, as the 'runtimepath' layout permits. In doing so, I also carefully applied the documentation's advice: * Short-circuiting repeated loads * Checking for existing mappings using the <Plug> prefix approach * Avoiding repeated function declarations overwriting each other * Guarding against 'cpotions' mangling things (by simply short-circuiting if 'compatible' is set). I've made the b:undo_ftplugin and b:undo_indent commands less forgiving, and append commands to it inline with the initial establishment of the setup they're reversing, including checking that the b:undo_* variable actually exists in the first place. For the indentation scripts, however, three of the four files originally in vim/indent actually do belong there: 1. csv.vim, because it doesn't have an indent file in the core. 2. tsv.vim, because it doesn't have an indent file in the core. 3. php.vim, because it does what ftplugins are allowed to do in preventing the core indent rules from running at all. The indent/vim.vim rules, however, have been moved to after/indent/vim.vim, because the tweaks it makes for two-space indentation are designed to supplement the core indent rules, not replace them. Finally, I've adjusted Makefile targets accordingly for the above, given the vim/ftplugin directory is now empty and there are three new directories in vim/after to install. We wrap these under a single `install-vim-after` parent target for convenience. The `install-vim-after-ftplugin` target accommodates the additional level of filetype directories beneath it.
* Merge branch 'feature/vim-plug-boilplate' into developTom Ryder2017-11-112-0/+6
|\ | | | | | | | | * feature/vim-plug-boilplate: Add author/license boilerplate to all plugins
| * Add author/license boilerplate to all pluginsTom Ryder2017-11-112-0/+6
| | | | | | | | user_ftplugin.vim and user_indent.vim seem to be missing it.
| * Merge branch 'release/v0.13.0'v0.13.0Tom Ryder2017-11-1142-173/+459
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * release/v0.13.0: (30 commits) Bump version number to 0.13.0 Move mutt_mail.vim line select logic into plugin Add new mail_mutt.vim plugin, apply mappings Sort 'shortmess' flag settings alphabetically Add 'o' and 'O' back into 'shortmess' Set up individual flags for 'shortmess' Fix oii(1df) so it works as a pipe Use exists+ test rather than exists& Adjust some whitespace and comment layout Move matchit.vim sourcing into plugin.vim Rename netrw.vim to plugin.vim Remove 'shellslash' setting Move fedora.vim into os.vim Remove 'tildeop' setting Rearrange three smaller files into display.vim Move 'paste' options into terminal.vim Move wildmenu config into completion.vim Rename complete.vim to completion.vim Rename term.vim to terminal.vim Rename yank.vim to registers.vim ...
| * \ Merge branch 'hotfix/v0.12.2'v0.12.2Tom Ryder2017-11-082-3/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | * hotfix/v0.12.2: Correct prefix for b:undo_* variable Bump version number to 0.12.2
* | \ \ Merge branch 'release/v0.13.0' into developTom Ryder2017-11-111-2/+2
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | * release/v0.13.0: Bump version number to 0.13.0
| * | | Bump version number to 0.13.0Tom Ryder2017-11-111-2/+2
|/ / /
* | | Merge branch 'feature/vim-mutt-plug' into developTom Ryder2017-11-113-0/+76
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * feature/vim-mutt-plug: Move mutt_mail.vim line select logic into plugin Add new mail_mutt.vim plugin, apply mappings Beginnings of a buffer-to-Mutt mailer plugin
| * | | Move mutt_mail.vim line select logic into pluginTom Ryder2017-11-112-10/+19
| | | | | | | | | | | | | | | | This makes the configuration shorter and easier to read.
| * | | Add new mail_mutt.vim plugin, apply mappingsTom Ryder2017-11-113-8/+65
| | | | | | | | | | | | | | | | | | | | This plugin provides a shortcut for staring email messages in Mutt with a range of lines.
| * | | Beginnings of a buffer-to-Mutt mailer pluginTom Ryder2017-11-081-0/+10
| | | |
* | | | Merge branch 'feature/vimrc-reunify' into developTom Ryder2017-11-1136-160/+354
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * feature/vimrc-reunify: (23 commits) Sort 'shortmess' flag settings alphabetically Add 'o' and 'O' back into 'shortmess' Set up individual flags for 'shortmess' Use exists+ test rather than exists& Adjust some whitespace and comment layout Move matchit.vim sourcing into plugin.vim Rename netrw.vim to plugin.vim Remove 'shellslash' setting Move fedora.vim into os.vim Remove 'tildeop' setting Rearrange three smaller files into display.vim Move 'paste' options into terminal.vim Move wildmenu config into completion.vim Rename complete.vim to completion.vim Rename term.vim to terminal.vim Rename yank.vim to registers.vim Move nrformats.vim content to format.vim Rename startup.vim to messages.vim Merge encoding.vim and file.vim into files.vim Move backup, swap, and undo dir logic into plugins ...
| * | | | Sort 'shortmess' flag settings alphabeticallyTom Ryder2017-11-101-6/+6
| | | | |
| * | | | Add 'o' and 'O' back into 'shortmess'Tom Ryder2017-11-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These flags prevent multiple messages from reading or writing multiple files from queuing up and forcing an enter prompt. They're part of the default, which is why I didn't notice their absence until I tried using the setting previous to this commit and opened two files at once.
| * | | | Set up individual flags for 'shortmess'Tom Ryder2017-11-101-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | Most of these are actually the default; may as well explicitly set and document them, however. t and T in particular are new.
| * | | | Use exists+ test rather than exists&Tom Ryder2017-11-105-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From :help hidden-options: >Not all options are supported in all versions. This depends on the >supported features and sometimes on the system. A remark about this is >in curly braces below. When an option is not supported it may still be >set without getting an error, this is called a hidden option. You can't >get the value of a hidden option though, it is not stored. > >To test if option "foo" can be used with ":set" use something like this: > if exists('&foo') >This also returns true for a hidden option. To test if option "foo" is >really supported use something like this: > if exists('+foo')
| * | | | Adjust some whitespace and comment layoutTom Ryder2017-11-107-3/+12
| | | | |
| * | | | Move matchit.vim sourcing into plugin.vimTom Ryder2017-11-102-4/+4
| | | | |
| * | | | Rename netrw.vim to plugin.vimTom Ryder2017-11-101-0/+0
| | | | | | | | | | | | | | | | | | | | For plugin-specific configuration.
| * | | | Remove 'shellslash' settingTom Ryder2017-11-101-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | This will allow the Windows-specific stuff in my new auto_* plugins to quote filenames correctly.
| * | | | Move fedora.vim into os.vimTom Ryder2017-11-101-0/+0
| | | | | | | | | | | | | | | | | | | | For OS-dependent config.
| * | | | Remove 'tildeop' settingTom Ryder2017-11-101-3/+0
| | | | | | | | | | | | | | | | | | | | I never use it. May as well defer to the vi default.
| * | | | Rearrange three smaller files into display.vimTom Ryder2017-11-105-18/+20
| | | | |
| * | | | Move 'paste' options into terminal.vimTom Ryder2017-11-102-6/+7
| | | | | | | | | | | | | | | | | | | | 'paste' is specific to the terminal only anyway.
| * | | | Move wildmenu config into completion.vimTom Ryder2017-11-102-23/+24
| | | | |
| * | | | Rename complete.vim to completion.vimTom Ryder2017-11-101-0/+0
| | | | | | | | | | | | | | | | | | | | Clearer filename and more consistent to use the noun.
| * | | | Rename term.vim to terminal.vimTom Ryder2017-11-101-0/+0
| | | | | | | | | | | | | | | | | | | | A little clearer and a needless abbreviation anyway.
| * | | | Rename yank.vim to registers.vimTom Ryder2017-11-101-0/+0
| | | | | | | | | | | | | | | | | | | | More likely to share options this way.
| * | | | Move nrformats.vim content to format.vimTom Ryder2017-11-102-3/+4
| | | | |
| * | | | Rename startup.vim to messages.vimTom Ryder2017-11-101-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | More accurate given the content, and more likely to have other options set in it.
| * | | | Merge encoding.vim and file.vim into files.vimTom Ryder2017-11-102-4/+5
| | | | |
| * | | | Move backup, swap, and undo dir logic into pluginsTom Ryder2017-11-109-71/+235
| | | | |
| * | | | Merge join,indent.vim into whitespace.vimTom Ryder2017-11-103-31/+33
| | | | |
| * | | | Append angle brackets rather than resetting optTom Ryder2017-11-101-1/+1
| | | | |
| * | | | Remove setting for 'tabstop'Tom Ryder2017-11-101-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | :help 'tabstop' says that setting it may be a bad idea: > Note: Setting 'tabstop' to any other value than 8 can make your file > appear wrong in many places (e.g., when printing it). On thinking about it, it's actually probably better to show literal tabs as eight screen spaces, as it will make it very obvious when there are tabs in the file.
* | | | | Merge branch 'feature/oii-fix' into developTom Ryder2017-11-102-11/+8
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | * feature/oii-fix: Fix oii(1df) so it works as a pipe
| * | | | Fix oii(1df) so it works as a pipeTom Ryder2017-11-102-11/+8
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I realised I could make this work by recording a single byte in the temporary file with dd(1) and then emitting that and then the rest of the input with cat(1) if the file ended up with a byte in it. This lets me remove the CAVEATS section from the manual, as it no longer applies.
* | | | Merge branch 'feature/vim-sh-syn' into developTom Ryder2017-11-091-0/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * feature/vim-sh-syn: Remove false error flagging for sh char class glob Fix 'while'/'until' highlighting in syntax/sh.vim
| * | | | Remove false error flagging for sh char class globTom Ryder2017-11-091-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The syntax highlighter flags this code with an error on the final square bracket: `case $foo in [![:ascii:]]) ;; esac`, but that's all legal. I'm not yet sure how to fix it, so will just turn the error group for now.
| * | | | Fix 'while'/'until' highlighting in syntax/sh.vimTom Ryder2017-11-091-0/+14
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | These two changes coax syntax/sh.vim into realising that POSIX shell does not specify 'until' as a builtin (that's a Bash/Ksh thing), and that POSIX shell is able to nest 'while' loops within other blocks (that's not a Bash/Ksh thing).
* | | | Merge branch 'hotfix/v0.12.2' into developTom Ryder2017-11-082-3/+3
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | * hotfix/v0.12.2: Correct prefix for b:undo_* variable Bump version number to 0.12.2
| * | Correct prefix for b:undo_* variableTom Ryder2017-11-081-1/+1
| | | | | | | | | | | | This was causing nasty errors whenever I started editing a Perl file.
| * | Bump version number to 0.12.2Tom Ryder2017-11-081-2/+2
| |/
| * Merge branch 'hotfix/v0.12.1'v0.12.1Tom Ryder2017-11-082-47/+48
| |\ | | | | | | | | | | | | | | | * hotfix/v0.12.1: Quote all Bash completion targets literally Bump version number to 0.12.1
* | \ Merge branch 'hotfix/v0.12.1' into developTom Ryder2017-11-082-47/+48
|\ \ \ | | |/ | |/| | | | | | | | | | * hotfix/v0.12.1: Quote all Bash completion targets literally Bump version number to 0.12.1
| * | Quote all Bash completion targets literallyTom Ryder2017-11-081-45/+46
| | | | | | | | | | | | | | | | | | This helps ShellCheck understand them as literal strings for linting purposes, but it seems (and highlights) a little bit clearer this way anyway.
| * | Bump version number to 0.12.1Tom Ryder2017-11-081-2/+2
| |/
| * Merge branch 'release/v0.12.0'v0.12.0Tom Ryder2017-11-0819-170/+259
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * release/v0.12.0: Update dotfiles(7) manual from README.md Bump version to 0.12.0 Use "nunmap" not "unmap" for b:undo_* var Remove null command from b:undo_* variables Use consistent/thorough ftplugin/indent unloading Add clustering for POSIX shell syntax groups Add `kill` as shStatement Add `break`, `continue`, `return` as shStatement Override commands and variables for syntax/sh.vim Disable unwanted shell error syntax for any shell Break a long conditional in vim/ftdetect/sh.vim Rename b:check and b:lint with sh_ prefix Remove overkill defined-and-false check of sh vars Clear b:check/lint in ftdetect/sh.vim b:undo Move ftplugin/sh.vim b:undo def to end of file Use correct undo variable name in ftplugin/sh.vim Remove superfluous augroups around ftdetect defs Use sh.vim local vars not global POSIX hacks Spell-checked and corrected README.md
| * \ Merge branch 'hotfix/v0.11.1'v0.11.1Tom Ryder2017-11-073-5/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | * hotfix/v0.11.1: Bump VERSION Remove asterisks flagging keyword in Vim help