aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2018-01-23Merge branch 'release/v0.26.0'v0.26.0Tom Ryder7-37/+17
* release/v0.26.0: Bump version number to 0.26.0 Remove Pathogen from Vim setup
2018-01-23Bump version number to 0.26.0Tom Ryder1-2/+2
2018-01-23Merge branch 'feature/no-pathogen' into developTom Ryder6-35/+15
* feature/no-pathogen: Remove Pathogen from Vim setup
2018-01-23Remove Pathogen from Vim setupTom Ryder6-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.
2018-01-21Merge branch 'release/v0.25.0' into developTom Ryder1-2/+2
* release/v0.25.0: Bump version number to 0.25.0
2018-01-21Merge branch 'release/v0.25.0'v0.25.0Tom Ryder10-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
2018-01-21Bump version number to 0.25.0Tom Ryder1-2/+2
2018-01-21Merge branch 'feature/vimrc-review' into developTom Ryder9-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
2018-01-21Suspend 'C' from 'cpoptions' for sh syn extensionsTom Ryder1-0/+12
This allows me to use line-breaking to keep the file readable.
2018-01-21Join short-circuit line in detect_background.vimTom Ryder1-2/+1
This makes the block work correctly when 'compatible' is set and 'C' is in 'cpoptions'.
2018-01-21Break some continued lines in Vim indent filesTom Ryder3-6/+4
This will mean they load correctly when the 'C' flag preventing line-breaking is in 'cpoptions', and 'compatible' is set.
2018-01-21Remove 'mac' from 'fileformats'Tom Ryder1-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.
2018-01-21Tweak 'cpoptions' C flag instead of 'nocompatible'Tom Ryder1-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.
2018-01-20Remove a baseless assertion I made in a configTom Ryder1-2/+1
Don't claim that syntax files tend to assume 'autoindent' is set, as it doesn't seem to be true.
2018-01-20Make entire syntax config dependent on load stateTom Ryder1-5/+3
2018-01-20Activate syntax settings conditionallyTom Ryder1-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.
2018-01-18Merge branch 'release/v0.24.0' into developTom Ryder1-2/+2
* release/v0.24.0: Bump version number to 0.24.0
2018-01-18Merge branch 'release/v0.24.0'v0.24.0Tom Ryder8-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
2018-01-18Bump version number to 0.24.0Tom Ryder1-2/+2
2018-01-18Merge branch 'feature/vim-plugin' into developTom Ryder3-12/+12
* feature/vim-plugin: Refactor directory creation in plugins
2018-01-18Merge branch 'feature/git-merge' into developTom Ryder1-0/+1
* feature/git-merge: Always add --log to `git merge`
2018-01-18Always add --log to `git merge`Tom Ryder1-0/+1
2018-01-17Refactor directory creation in pluginsTom Ryder3-12/+12
No functional changes here, just removing a little duplicate code.
2018-01-17Merge branch 'feature/vim-after-s...' into developTom Ryder3-6/+1
* feature/vim-after-syntax: Remove HTML and PHP syntax highlighting tweaks Clear unwanted syntax group, don't link to NONE
2018-01-17Remove HTML and PHP syntax highlighting tweaksTom Ryder2-5/+0
The things they were intended to fix aren't actually that bad, on review.
2018-01-17Clear unwanted syntax group, don't link to NONETom Ryder1-1/+1
2018-01-15Merge branch 'release/v0.23.0' into developTom Ryder1-2/+2
* release/v0.23.0: Bump version number to 0.23.0
2018-01-15Merge branch 'release/v0.23.0'v0.23.0Tom Ryder15-53/+61
* release/v0.23.0: Bump version number to 0.23.0 Remove unused `self` var from clog(1df) Change double-quote printf pattern to single-quote Move ShellCheck line to correct place in sra(1df) Quote EDITOR/VISUAL assignments for clarity Explicitly ignore uninteresting tree(1) opts Refactor clog(1df), allow args and non-term stdin Reimplement bl(1df) in Awk Separate ax(1df) manpage args from command Make newline explicit for ax(1df) Make first ax(1df) arg safer, warn on second arg Correct monospaced blocks in Vim plugin docs
2018-01-15Bump version number to 0.23.0Tom Ryder1-2/+2
2018-01-15Merge branch 'feature/shellcheck-...' into developTom Ryder6-7/+8
* feature/shellcheck-0.4.7-review: Remove unused `self` var from clog(1df) Change double-quote printf pattern to single-quote Move ShellCheck line to correct place in sra(1df) Quote EDITOR/VISUAL assignments for clarity Explicitly ignore uninteresting tree(1) opts
2018-01-15Remove unused `self` var from clog(1df)Tom Ryder1-1/+0
ShellCheck: In bin/clog.sh line 2: self=clog ^-- SC2034: self appears unused. Verify it or export it.
2018-01-15Change double-quote printf pattern to single-quoteTom Ryder1-1/+1
ShellCheck 0.4.7 pointed to this indirectly: In bin/sshi line 24: printf "%s:%u -> %s:%u (%s)\n" \ ^-- SC1117: Backslash is literal in "\n". Prefer explicit escaping: "\\n".
2018-01-15Move ShellCheck line to correct place in sra(1df)Tom Ryder1-1/+2
ShellCheck 0.4.7 was upset about this: In bin/sra line 7: ssh -qt -- "$hostname" "$@" <&3 # shellcheck disable=SC2029 ^-- SC1073: Couldn't parse this simple command. ^-- SC1126: Place shellcheck directives before commands, not after. ^-- SC1072: Fix any mentioned problems and try again.
2018-01-15Quote EDITOR/VISUAL assignments for clarityTom Ryder2-4/+4
This appeases ShellCheck 0.4.7, which is fretting that I meant a command expansion. I didn't, but it seems a bit nicer to quote these anyway. In sh/profile.d/editor.sh line 4: EDITOR=ed ^-- SC2209: Use var=$(command) to assign output (or quote to assign string). In sh/profile.d/editor.sh line 22: EDITOR=ex ^-- SC2209: Use var=$(command) to assign output (or quote to assign string). In sh/profile.d/visual.sh line 2: VISUAL=vi ^-- SC2209: Use var=$(command) to assign output (or quote to assign string).
2018-01-15Explicitly ignore uninteresting tree(1) optsTom Ryder1-0/+1
ShellCheck 0.4.7 complained about this: In sh/shrc.d/tree.sh line 12: case $opt in ^-- SC2220: Invalid flags are not handled. Add a *) case.
2018-01-15Merge branch 'feature/bin-review' into developTom Ryder4-26/+32
* feature/bin-review: Refactor clog(1df), allow args and non-term stdin Reimplement bl(1df) in Awk
2018-01-15Refactor clog(1df), allow args and non-term stdinTom Ryder2-16/+27
This makes a bit clearer how awkward the rlwrap(1) code is, too. It may not be worth keeping it.
2018-01-13Reimplement bl(1df) in AwkTom Ryder2-10/+5
This is shorter and tidier.
2018-01-11Merge branch 'feature/ax-safety' into developTom Ryder2-14/+15
* feature/ax-safety: Separate ax(1df) manpage args from command Make newline explicit for ax(1df) Make first ax(1df) arg safer, warn on second arg
2018-01-11Separate ax(1df) manpage args from commandTom Ryder1-2/+4
Just for a clearer visual distinction. This probably needs to be done for other manual pages, too. We use zero-width characters (\&) at the start of the lines beginning with apostrophes so that they get printed literally.
2018-01-11Make newline explicit for ax(1df)Tom Ryder2-3/+3
This makes it a little more flexible, if you genuinely don't want a newline in the output.
2018-01-11Make first ax(1df) arg safer, warn on second argTom Ryder2-10/+9
The format in the first argument does not need to be evaluated, so it can be passed in a simple awk variable. The second argument is evaluated, by design, so code injection is trivial. It's probably a good idea to warn users about this explicitly. $ ax '0);system("cat /etc/passwd")' Make the whole thing a little terser, too, with the awk program construction, variable assignment, and invocation all on one line.
2018-01-08Merge branch 'feature/vim-doc-fix' into developTom Ryder3-4/+4
* feature/vim-doc-fix: Correct monospaced blocks in Vim plugin docs
2018-01-08Correct monospaced blocks in Vim plugin docsTom Ryder3-4/+4
Close unclosed blocks, and remove an unwanted block.
2017-12-29Merge branch 'hotfix/v0.22.1' into developTom Ryder4-5/+5
* hotfix/v0.22.1: Bump version number to 0.22.1 (hotfix) Allow specifying GnuPG --keyid-format at build Rebuild dotfiles(7) manual page Bump version number to 0.22.0
2017-12-29Merge branch 'hotfix/v0.22.1'v0.22.1Tom Ryder3-3/+5
* hotfix/v0.22.1: Bump version number to 0.22.1 (hotfix) Allow specifying GnuPG --keyid-format at build
2017-12-29Bump version number to 0.22.1 (hotfix)Tom Ryder1-2/+2
2017-12-29Allow specifying GnuPG --keyid-format at buildTom Ryder2-1/+3
Old versions of gpg(1) don't support "none" as a --keyid-format; allow specifying it as a Makefile variable KEYID_FORMAT.
2017-12-29Merge branch 'release/v0.22.0'v0.22.0Tom Ryder7-28/+10
* release/v0.22.0: Rebuild dotfiles(7) manual page Bump version number to 0.22.0 Update key fingerprint for finger(1) Use only fingerprints for GnuPG keys Remove --batch option and wrapper for gpg(1)
2017-12-29Rebuild dotfiles(7) manual pageTom Ryder1-2/+0