aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | * Refactor directory creation in pluginsTom Ryder2018-01-173-12/+12
| | | | | | | | | | | | No functional changes here, just removing a little duplicate code.
| * | Merge branch 'feature/git-merge' into developTom Ryder2018-01-181-0/+1
| |\ \ | | |/ | |/| | | | | | | * feature/git-merge: Always add --log to `git merge`
| | * Always add --log to `git merge`Tom Ryder2018-01-181-0/+1
| |/
| * Merge branch 'feature/vim-after-s...' into developTom Ryder2018-01-173-6/+1
| |\ | | | | | | | | | | | | | | | * feature/vim-after-syntax: Remove HTML and PHP syntax highlighting tweaks Clear unwanted syntax group, don't link to NONE
| | * Remove HTML and PHP syntax highlighting tweaksTom Ryder2018-01-172-5/+0
| | | | | | | | | | | | | | | The things they were intended to fix aren't actually that bad, on review.
| | * Clear unwanted syntax group, don't link to NONETom Ryder2018-01-171-1/+1
| |/
| * Merge branch 'release/v0.23.0' into developTom Ryder2018-01-151-2/+2
| |\ | | | | | | | | | | | | * release/v0.23.0: Bump version number to 0.23.0
* | \ Merge branch 'release/v0.23.0'v0.23.0Tom Ryder2018-01-1515-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
| * | Bump version number to 0.23.0Tom Ryder2018-01-151-2/+2
| |/
| * Merge branch 'feature/shellcheck-...' into developTom Ryder2018-01-156-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
| | * Remove unused `self` var from clog(1df)Tom Ryder2018-01-151-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | ShellCheck: In bin/clog.sh line 2: self=clog ^-- SC2034: self appears unused. Verify it or export it.
| | * Change double-quote printf pattern to single-quoteTom Ryder2018-01-151-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".
| | * Move ShellCheck line to correct place in sra(1df)Tom Ryder2018-01-151-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.
| | * Quote EDITOR/VISUAL assignments for clarityTom Ryder2018-01-152-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).
| | * Explicitly ignore uninteresting tree(1) optsTom Ryder2018-01-151-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.
| * Merge branch 'feature/bin-review' into developTom Ryder2018-01-154-26/+32
| |\ | | | | | | | | | | | | | | | * feature/bin-review: Refactor clog(1df), allow args and non-term stdin Reimplement bl(1df) in Awk
| | * Refactor clog(1df), allow args and non-term stdinTom Ryder2018-01-152-16/+27
| | | | | | | | | | | | | | | This makes a bit clearer how awkward the rlwrap(1) code is, too. It may not be worth keeping it.
| | * Reimplement bl(1df) in AwkTom Ryder2018-01-132-10/+5
| |/ | | | | | | This is shorter and tidier.
| * Merge branch 'feature/ax-safety' into developTom Ryder2018-01-112-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
| | * Separate ax(1df) manpage args from commandTom Ryder2018-01-111-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.
| | * Make newline explicit for ax(1df)Tom Ryder2018-01-112-3/+3
| | | | | | | | | | | | | | | This makes it a little more flexible, if you genuinely don't want a newline in the output.
| | * Make first ax(1df) arg safer, warn on second argTom Ryder2018-01-112-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.
| * Merge branch 'feature/vim-doc-fix' into developTom Ryder2018-01-083-4/+4
| |\ | | | | | | | | | | | | * feature/vim-doc-fix: Correct monospaced blocks in Vim plugin docs
| | * Correct monospaced blocks in Vim plugin docsTom Ryder2018-01-083-4/+4
| |/ | | | | | | Close unclosed blocks, and remove an unwanted block.
| * Merge branch 'hotfix/v0.22.1' into developTom Ryder2017-12-294-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
* | \ Merge branch 'hotfix/v0.22.1'v0.22.1Tom Ryder2017-12-293-3/+5
|\ \ \ | | |/ | |/| | | | | | | | | | * hotfix/v0.22.1: Bump version number to 0.22.1 (hotfix) Allow specifying GnuPG --keyid-format at build
| * | Bump version number to 0.22.1 (hotfix)Tom Ryder2017-12-291-2/+2
| | |
| * | Allow specifying GnuPG --keyid-format at buildTom Ryder2017-12-292-1/+3
|/ / | | | | | | | | Old versions of gpg(1) don't support "none" as a --keyid-format; allow specifying it as a Makefile variable KEYID_FORMAT.
* | Merge branch 'release/v0.22.0'v0.22.0Tom Ryder2017-12-297-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)
| * | Rebuild dotfiles(7) manual pageTom Ryder2017-12-291-2/+0
| | |
| * | Bump version number to 0.22.0Tom Ryder2017-12-291-2/+2
| |/
| * Merge branch 'feature/gpg-fp-only' into developTom Ryder2017-12-293-8/+8
| |\ | | | | | | | | | | | | | | | * feature/gpg-fp-only: Update key fingerprint for finger(1) Use only fingerprints for GnuPG keys
| | * Update key fingerprint for finger(1)Tom Ryder2017-12-291-5/+5
| | |
| | * Use only fingerprints for GnuPG keysTom Ryder2017-12-292-3/+3
| |/ | | | | | | The manual page for gpg(1) says this is the safest way to do it.
| * Merge branch 'feature/gpg-no-batch' into developTom Ryder2017-12-293-16/+0
| |\ | | | | | | | | | | | | * feature/gpg-no-batch: Remove --batch option and wrapper for gpg(1)