aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release/v0.28.0'v0.28.0Tom Ryder2018-02-125-5/+5
|\ | | | | | | | | | | | | | | * release/v0.28.0: Bump VERSION Update Vim plugin submodules Add missing options terminator to Makefile Suppress error messages in td(1df)
| * Bump VERSIONTom Ryder2018-02-121-2/+2
| |
| * Merge branch 'release/v0.27.0' into developTom Ryder2018-02-121-2/+2
| |\ | | | | | | | | | | | | * release/v0.27.0: Bump version to 0.27.0
| * \ Merge branch 'feature/vim-submods' into developTom Ryder2018-02-122-0/+0
| |\ \ | | | | | | | | | | | | | | | | * feature/vim-submods: Update Vim plugin submodules
| | * | Update Vim plugin submodulesTom Ryder2018-02-122-0/+0
| |/ /
| * | Merge branch 'feature/makefile' into developTom Ryder2018-02-071-1/+1
| |\ \ | | | | | | | | | | | | | | | | * feature/makefile: Add missing options terminator to Makefile
| | * | Add missing options terminator to MakefileTom Ryder2018-02-071-1/+1
| |/ /
| * | Merge branch 'feature/td-quiet' into developTom Ryder2018-02-051-2/+2
| |\ \ | | | | | | | | | | | | | | | | * feature/td-quiet: Suppress error messages in td(1df)
| | * | Suppress error messages in td(1df)Tom Ryder2018-02-051-2/+2
| |/ / | | | | | | | | | | | | Don't report to the user when a repository is created, and ignore errors from git-diff-index(1) for when there is no HEAD
* | | Merge branch 'release/v0.27.0'v0.27.0Tom Ryder2018-02-015-9/+55
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | * release/v0.27.0: Bump version to 0.27.0 Replace ftplugin/php.vim with custom version Adjust explanation of PHP indent skip Remove help ftdetect rules
| * | Bump version to 0.27.0Tom Ryder2018-02-011-2/+2
| |/
| * Merge branch 'feature/vim-php' into developTom Ryder2018-02-013-3/+53
| |\ | | | | | | | | | | | | | | | * feature/vim-php: Replace ftplugin/php.vim with custom version Adjust explanation of PHP indent skip
| | * Replace ftplugin/php.vim with custom versionTom Ryder2018-02-012-0/+44
| | | | | | | | | | | | | | | | | | | | | Per the comment in the new file, this is to avoid loading in HTML ftplugins as well, a curiosity of the stock ftplugin/php.vim file that's probably a well-intentioned way of accommodating templated files with a mix of PHP and HTML in them.
| | * Adjust explanation of PHP indent skipTom Ryder2018-02-011-3/+9
| |/ | | | | | | Include the variable guard, just for completeness' sake.
| * Merge branch 'feature/vim-ftdetect' into developTom Ryder2018-01-261-4/+0
| |\ | | | | | | | | | | | | * feature/vim-ftdetect: Remove help ftdetect rules
| | * Remove help ftdetect rulesTom Ryder2018-01-261-4/+0
| |/ | | | | | | No longer applicable since pathogen.vim was removed in 3e2740f.
| * Merge branch 'hotfix/v0.26.3' into developTom Ryder2018-01-263-5/+2
| |\ | | | | | | | | | | | | | | | * hotfix/v0.26.3: Bump version number to 0.26.3 Remove vim-lion plugin for now
| * \ Merge branch 'hotfix/v0.26.2' into developTom Ryder2018-01-232-2/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | * hotfix/v0.26.2: Bump version number to 0.26.2 Actually remove pathogen bundle dir
| * \ \ Merge branch 'hotfix/v0.26.1' into developTom Ryder2018-01-232-5/+10
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * hotfix/v0.26.1: Bump version number to 0.26.1 (hotfix) Exclude root-level files from Vim bundles Restore install-vim-autoload target
| * \ \ \ Merge branch 'release/v0.26.0' into developTom Ryder2018-01-231-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * release/v0.26.0: Bump version number to 0.26.0
* | \ \ \ \ Merge branch 'hotfix/v0.26.3'v0.26.3Tom Ryder2018-01-263-5/+2
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | * hotfix/v0.26.3: Bump version number to 0.26.3 Remove vim-lion plugin for now
| * | | | | Bump version number to 0.26.3Tom Ryder2018-01-261-2/+2
| | | | | |
| * | | | | Remove vim-lion plugin for nowTom Ryder2018-01-262-3/+0
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It doesn't have guards for old Vim, compatibility settings, or repeat-reload checks, which is not very good, and means it spits errors on old Vims about newer constructs like :finally, where all the other plugins are well-behaved. I was going to replace it with vim-easy-align, but that doesn't seem to have a version or compatibility guard either, though it does have a repeat-reload check which means I could probably shoehorn in a version check before loading it, but even that seems a bit gross. So, I might just leave lining things up nicely to the various tidy scripts. Let's see how much I miss it.
* | | | | Merge branch 'hotfix/v0.26.2'v0.26.2Tom Ryder2018-01-232-2/+2
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | * hotfix/v0.26.2: Bump version number to 0.26.2 Actually remove pathogen bundle dir
| * | | | Bump version number to 0.26.2Tom Ryder2018-01-231-2/+2
| | | | |
| * | | | Actually remove pathogen bundle dirTom Ryder2018-01-231-0/+0
|/ / / /
* | | | Merge branch 'hotfix/v0.26.1'v0.26.1Tom Ryder2018-01-232-5/+10
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | * hotfix/v0.26.1: Bump version number to 0.26.1 (hotfix) Exclude root-level files from Vim bundles Restore install-vim-autoload target
| * | | Bump version number to 0.26.1 (hotfix)Tom Ryder2018-01-231-2/+2
| | | |
| * | | Exclude root-level files from Vim bundlesTom Ryder2018-01-231-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Create the plugin directory hierarchy first, and then copy the files in as long as they're at least one file deep. This prevents files like README.markdown landing in ~/.vim.
| * | | Restore install-vim-autoload targetTom Ryder2018-01-231-0/+5
|/ / / | | | | | | | | | It was mistakenly removed in 3e2740f for v0.26.0.
* | | Merge branch 'release/v0.26.0'v0.26.0Tom Ryder2018-01-237-37/+17
|\ \ \ | | |/ | |/| | | | | | | | | | * release/v0.26.0: Bump version number to 0.26.0 Remove Pathogen from Vim setup
| * | Bump version number to 0.26.0Tom Ryder2018-01-231-2/+2
| |/
| * Merge branch 'feature/no-pathogen' into developTom Ryder2018-01-236-35/+15
| |\ | | | | | | | | | | | | * feature/no-pathogen: Remove Pathogen from Vim setup
| | * Remove Pathogen from Vim setupTom Ryder2018-01-236-35/+15
| |/ | | | | | | | | | | | | Given that all of this is installed rather than symbolically linked, there's not really any harm following the old mixed ~/.vim layout for plugins. It's one less dependency and it makes the setup quite a bit less complicated.
| * Merge branch 'release/v0.25.0' into developTom Ryder2018-01-211-2/+2
| |\ | | | | | | | | | | | | * release/v0.25.0: Bump version number to 0.25.0
* | \ Merge branch 'release/v0.25.0'v0.25.0Tom Ryder2018-01-2110-19/+35
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * release/v0.25.0: Bump version number to 0.25.0 Suspend 'C' from 'cpoptions' for sh syn extensions Join short-circuit line in detect_background.vim Break some continued lines in Vim indent files Remove 'mac' from 'fileformats' Tweak 'cpoptions' C flag instead of 'nocompatible' Remove a baseless assertion I made in a config Make entire syntax config dependent on load state Activate syntax settings conditionally
| * | Bump version number to 0.25.0Tom Ryder2018-01-211-2/+2
| |/
| * Merge branch 'feature/vimrc-review' into developTom Ryder2018-01-219-17/+33
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * feature/vimrc-review: Suspend 'C' from 'cpoptions' for sh syn extensions Join short-circuit line in detect_background.vim Break some continued lines in Vim indent files Remove 'mac' from 'fileformats' Tweak 'cpoptions' C flag instead of 'nocompatible' Remove a baseless assertion I made in a config Make entire syntax config dependent on load state Activate syntax settings conditionally
| | * Suspend 'C' from 'cpoptions' for sh syn extensionsTom Ryder2018-01-211-0/+12
| | | | | | | | | | | | This allows me to use line-breaking to keep the file readable.
| | * Join short-circuit line in detect_background.vimTom Ryder2018-01-211-2/+1
| | | | | | | | | | | | | | | This makes the block work correctly when 'compatible' is set and 'C' is in 'cpoptions'.
| | * Break some continued lines in Vim indent filesTom Ryder2018-01-213-6/+4
| | | | | | | | | | | | | | | This will mean they load correctly when the 'C' flag preventing line-breaking is in 'cpoptions', and 'compatible' is set.
| | * Remove 'mac' from 'fileformats'Tom Ryder2018-01-211-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | It seems unlikely that I'll ever edit a MacOS encoded file in my lifetime on the Unix and Windows systems to which these dotfiles are deployed, and when 'compatible' is set, the default empty value for this option breaks everything with a bunch of ^J characters in every god-fearing file. Not worth the trouble.
| | * Tweak 'cpoptions' C flag instead of 'nocompatible'Tom Ryder2018-01-211-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order for the configuration to be successfully loaded, the only option in the vi 'cpoptions' settings for 'compatible' is "C". From :help 'cpoptions': > C Do not concatenate sourced lines that start with a backslash. > See line-continuation. With this flag removed from 'cpoptions' if 'compatible' does happen to be set, the configuration parses just fine, and then we can put it back at the end if we need to. This is a less aggressive approach than just turning off 'compatible' entirely if it happens to be set, whether because the user wanted it that way before loading the configuration or because Vim was started as ex(1). My plugins and ftplugins are all conditional on 'compatible' not being set, anyway.
| | * Remove a baseless assertion I made in a configTom Ryder2018-01-201-2/+1
| | | | | | | | | | | | | | | Don't claim that syntax files tend to assume 'autoindent' is set, as it doesn't seem to be true.
| | * Make entire syntax config dependent on load stateTom Ryder2018-01-201-5/+3
| | |
| | * Activate syntax settings conditionallyTom Ryder2018-01-201-2/+4
| |/ | | | | | | | | | | | | | | | | Per an oft-made recommendation on /r/vim .vimrc review threads: <https://www.reddit.com/r/vim/comments/6znskl/vimrc_review_thread/dnbmvxv/> > Re-sourcing the vimrc won't clobber any of your personal highlight > settings and the if part helps avoid unneeded re-execution/reprocessing.
| * Merge branch 'release/v0.24.0' into developTom Ryder2018-01-181-2/+2
| |\ | | | | | | | | | | | | * release/v0.24.0: Bump version number to 0.24.0
* | \ Merge branch 'release/v0.24.0'v0.24.0Tom Ryder2018-01-188-20/+16
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | * release/v0.24.0: Bump version number to 0.24.0 Always add --log to `git merge` Refactor directory creation in plugins Remove HTML and PHP syntax highlighting tweaks Clear unwanted syntax group, don't link to NONE
| * | Bump version number to 0.24.0Tom Ryder2018-01-181-2/+2
| |/
| * Merge branch 'feature/vim-plugin' into developTom Ryder2018-01-183-12/+12
| |\ | | | | | | | | | | | | * feature/vim-plugin: Refactor directory creation in plugins