diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2019-08-14 14:18:59 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2019-08-14 14:18:59 +1200 |
commit | 8a7d53c1b1a44a04e86c3aa220786a57accb47ce (patch) | |
tree | 16c4f60f11f18323a9667167c848963d9fde254f | |
parent | Merge branch 'release/v7.5.0' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-7.6.0.tar.gz (sig) dotfiles-7.6.0.zip |
Merge branch 'release/v7.6.0'v7.6.0
* release/v7.6.0:
Use nice characters in vimrc stub
Make intent of `umake` terminal condition clearer
-rw-r--r-- | VERSION | 4 | ||||
-rw-r--r-- | bin/umake.sh | 3 | ||||
-rw-r--r-- | vim/vimrc.stub | 14 |
3 files changed, 11 insertions, 10 deletions
@@ -1,2 +1,2 @@ -tejr dotfiles v7.5.0 -Thu, 01 Aug 2019 22:54:02 +0000 +tejr dotfiles v7.6.0 +Wed, 14 Aug 2019 02:18:58 +0000 diff --git a/bin/umake.sh b/bin/umake.sh index 3c381e09..18f9b53e 100644 --- a/bin/umake.sh +++ b/bin/umake.sh @@ -3,7 +3,8 @@ while [ "$PWD" != / ] ; do for mf in makefile Makefile ; do [ -f "$mf" ] || continue - exec make "$@" + make "$@" + exit done cd .. || exit done diff --git a/vim/vimrc.stub b/vim/vimrc.stub index 9eecd487..b7def1d5 100644 --- a/vim/vimrc.stub +++ b/vim/vimrc.stub @@ -1,7 +1,7 @@ " 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, and that we're running Vim v7.0.0 or newer. If it's all +" 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. " @@ -10,14 +10,14 @@ if !&compatible && !exists('$POSIXLY_CORRECT') && v:version >= 700 finish 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 |