aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2017-11-14 10:09:40 +1300
committerTom Ryder <tom@sanctum.geek.nz>2017-11-14 10:09:40 +1300
commitd18c0c237c5fcd7c7d3484eb591cce0a4f8d104b (patch)
treedc5aaf180d8645b021ca18d22583d034b5aafd31
parentfbd2cdef858a0d6e2b0bbecf223c6b0860b6d3b7 (diff)
parent2c1cffce2b0ae491a3755e9d9d95987ff71b64b9 (diff)
downloaddotfiles-0.17.0.tar.gz
Merge branch 'release/v0.17.0'v0.17.0
* release/v0.17.0: Bump version number to 0.17.0 Move mapleader settings before .vimrc conf source Strip trailing whitespace Check for shellescape() function before using it Force muttrc filetype from ftdetect rules
-rw-r--r--VERSION4
-rw-r--r--bin/gwp.awk2
-rw-r--r--bin/onl.awk2
-rw-r--r--bin/osc.sh4
-rw-r--r--bin/sqs.sh2
-rw-r--r--bin/unf.awk2
-rw-r--r--games/philsay.sh8
-rw-r--r--man/man1/dam.1df2
-rw-r--r--man/man1/p.1df2
-rw-r--r--man/man1/ped.1df2
-rw-r--r--man/man1/pph.1df2
-rw-r--r--man/man1/pst.1df4
-rw-r--r--man/man1/pvi.1df2
-rw-r--r--man/man1/trs.1df2
-rw-r--r--sh/shrc.d/xd.sh2
-rw-r--r--vim/config/leader.vim5
-rw-r--r--vim/config/plugin.vim2
-rw-r--r--vim/ftdetect/muttrc.vim2
-rw-r--r--vim/plugin/auto_backupdir.vim16
-rw-r--r--vim/plugin/auto_swapdir.vim16
-rw-r--r--vim/plugin/auto_undodir.vim16
-rw-r--r--vim/plugin/mail_mutt.vim2
-rw-r--r--vim/vimrc6
23 files changed, 57 insertions, 50 deletions
diff --git a/VERSION b/VERSION
index c78adde1..89d1ac52 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v0.16.0
-Sun Nov 12 12:04:12 UTC 2017
+tejr dotfiles v0.17.0
+Mon Nov 13 21:09:10 UTC 2017
diff --git a/bin/gwp.awk b/bin/gwp.awk
index 6b558388..60013add 100644
--- a/bin/gwp.awk
+++ b/bin/gwp.awk
@@ -1,6 +1,6 @@
# Search for alphanumeric words in a file
BEGIN {
-
+
# Name self
self = "gwp"
diff --git a/bin/onl.awk b/bin/onl.awk
index 89469f3c..30f7e594 100644
--- a/bin/onl.awk
+++ b/bin/onl.awk
@@ -1,7 +1,7 @@
# Flatten input into one single-space separated line with no unprintable chars
# For each line of input ...
-{
+{
# Replace groups of spaces and control characters with one space,
# implicitly re-splitting the fields
gsub(/[\a\b\f\n\r\t\v ]+/, " ")
diff --git a/bin/osc.sh b/bin/osc.sh
index 47d62089..86923f12 100644
--- a/bin/osc.sh
+++ b/bin/osc.sh
@@ -1,5 +1,5 @@
# Sane and safe OpenSSL s_client(1ssl) connection
-self=osc
+self=osc
# Check we have openssl(1); we need to fail early lest we go setting up FIFOs
# needlessly
@@ -67,7 +67,7 @@ for sig in EXIT HUP INT TERM ; do
# shellcheck disable=SC2064
trap "cleanup $sig" "$sig"
done
-
+
# Create a temporary directory and a FIFO in it
td=$(mktd "$self") || exit
mkfifo -- "$td"/verify-filter || exit
diff --git a/bin/sqs.sh b/bin/sqs.sh
index e00797e3..28435059 100644
--- a/bin/sqs.sh
+++ b/bin/sqs.sh
@@ -13,7 +13,7 @@ for sn ; do
# Strip trailing slash if any and then query string
sn=${sn%/}
dn=${sn%%\?*}
-
+
# Ignore this file if its name wouldn't change
[ "$sn" != "$dn" ] || continue
diff --git a/bin/unf.awk b/bin/unf.awk
index 7acb09c2..57f5f0cf 100644
--- a/bin/unf.awk
+++ b/bin/unf.awk
@@ -11,7 +11,7 @@ function wrbuf() {
# Flag to stop processing once we hit the first blank line
!length($0) {
- wrbuf()
+ wrbuf()
body = 1
}
body {
diff --git a/games/philsay.sh b/games/philsay.sh
index 1c02bf57..0fa21ff6 100644
--- a/games/philsay.sh
+++ b/games/philsay.sh
@@ -19,11 +19,11 @@ cat <<'EOF'
;''''''',####,###: +############.
,###''''''#############` ;##:#######
,#:##''';+#####+ :###### +##+ +
- ,'#;#,''#####',+###` ;####`+
- ,#'#,#';############++. ,`##
- :#####+:#######,@,``@@,#####'
+ ,'#;#,''#####',+###` ;####`+
+ ,#'#,#';############++. ,`##
+ :#####+:#######,@,``@@,#####'
;#+#+#############++++##.#+## +
- ###+################'####'##
+ ###+################'####'##
#######+###################.# :.
######'########################'
,+#####;#######################
diff --git a/man/man1/dam.1df b/man/man1/dam.1df
index 78f5210c..62036473 100644
--- a/man/man1/dam.1df
+++ b/man/man1/dam.1df
@@ -4,7 +4,7 @@
\- read all input before emitting as output
.SH SYNOPSIS
prog1 |
-.B
+.B
dam
| prog2
.SH DESCRIPTION
diff --git a/man/man1/p.1df b/man/man1/p.1df
index 2f9f3c45..cddd0fb1 100644
--- a/man/man1/p.1df
+++ b/man/man1/p.1df
@@ -35,7 +35,7 @@ because I like that and it's POSIX.
.br
Is there--is there balm in Gilead?--tell me--tell me, I implore!"
.br
- Quoth the Raven "Nevermore."
+ Quoth the Raven "Nevermore."
.P
-- Poe
.SH SEE ALSO
diff --git a/man/man1/ped.1df b/man/man1/ped.1df
index fba85943..041e73c5 100644
--- a/man/man1/ped.1df
+++ b/man/man1/ped.1df
@@ -4,7 +4,7 @@
\- stop a pipe for $EDITOR intervention
.SH SYNOPSIS
prog1 |
-.B
+.B
ped
| prog2
.SH DESCRIPTION
diff --git a/man/man1/pph.1df b/man/man1/pph.1df
index f68b394d..b99d2a8e 100644
--- a/man/man1/pph.1df
+++ b/man/man1/pph.1df
@@ -11,7 +11,7 @@ runs pp(1df) on the arguments to print the full path to each one, and also
prepends the machine's hostname and a colon to each line.
.SH CAVEATS
Newlines in filenames will mess this up. This is for generating human-readable
-file lists, not for machines.
+file lists, not for machines.
.SH SEE ALSO
pp(1df)
.SH AUTHOR
diff --git a/man/man1/pst.1df b/man/man1/pst.1df
index cf3ce281..d24cda4e 100644
--- a/man/man1/pst.1df
+++ b/man/man1/pst.1df
@@ -4,12 +4,12 @@
\- stop a pipe for manual viewing or intervention
.SH SYNOPSIS
prog1 |
-.B
+.B
pst
| prog2
.br
prog1 |
-.B
+.B
pst ed
| prog2
.SH DESCRIPTION
diff --git a/man/man1/pvi.1df b/man/man1/pvi.1df
index 6a21e6e8..2c0903c9 100644
--- a/man/man1/pvi.1df
+++ b/man/man1/pvi.1df
@@ -4,7 +4,7 @@
\- stop a pipe for $EDITOR intervention
.SH SYNOPSIS
prog1 |
-.B
+.B
pvi
| prog2
.SH DESCRIPTION
diff --git a/man/man1/trs.1df b/man/man1/trs.1df
index 93b2cad3..5b3ada3a 100644
--- a/man/man1/trs.1df
+++ b/man/man1/trs.1df
@@ -7,7 +7,7 @@
STRING REPLACEMENT
< file
.br
-program |
+program |
.B trs
STRING REPLACEMENT
.SH DESCRIPTION
diff --git a/sh/shrc.d/xd.sh b/sh/shrc.d/xd.sh
index 40319cf2..7c17adea 100644
--- a/sh/shrc.d/xd.sh
+++ b/sh/shrc.d/xd.sh
@@ -18,7 +18,7 @@ xd() {
# Try to change into the marked directory
cd -- "$1" || return
-
+
# If that worked, we can swap the mark, and we're done
PMD=$2
}
diff --git a/vim/config/leader.vim b/vim/config/leader.vim
deleted file mode 100644
index e17aed06..00000000
--- a/vim/config/leader.vim
+++ /dev/null
@@ -1,5 +0,0 @@
-" Use different keys for global and local leaders
-if has('eval')
- let g:mapleader = '\'
- let g:maplocalleader = '_'
-endif
diff --git a/vim/config/plugin.vim b/vim/config/plugin.vim
index 934424ed..6e79b255 100644
--- a/vim/config/plugin.vim
+++ b/vim/config/plugin.vim
@@ -20,7 +20,7 @@ if has('eval')
" Vim servers? What is this, Emacs?
let g:loaded_rrhelper = 'skipped'
-
+
" System dictionaries plus custom per-machine spell files are fine
let g:loaded_spellfile_plugin = 'skipped'
diff --git a/vim/ftdetect/muttrc.vim b/vim/ftdetect/muttrc.vim
index 55eeea93..60d31575 100644
--- a/vim/ftdetect/muttrc.vim
+++ b/vim/ftdetect/muttrc.vim
@@ -1,4 +1,4 @@
" Add automatic commands to detect .muttrc files
autocmd BufNewFile,BufRead
\ **/.dotfiles/mutt/muttrc.d/*.rc,**/.muttrc.d/*.rc
- \ setfiletype muttrc
+ \ setlocal filetype=muttrc
diff --git a/vim/plugin/auto_backupdir.vim b/vim/plugin/auto_backupdir.vim
index d15c3150..17a1a646 100644
--- a/vim/plugin/auto_backupdir.vim
+++ b/vim/plugin/auto_backupdir.vim
@@ -18,7 +18,7 @@ else
" This is imperfect in that it will break if you have a backslashed comma in
" the first component of your &runtimepath, but if you're doing that, you
" probably already have way bigger problems
- let s:backupdir
+ let s:backupdir
\ = strpart(&runtimepath, 0, stridx(&runtimepath, ','))
\ . '/backup'
endif
@@ -32,12 +32,14 @@ if !isdirectory(expand(s:backupdir))
" Failing that, use an OS-dependent command
" (Fortunately, Unix and Windows are the only OS types in the world)
- elseif has('unix')
- silent! execute '!mkdir -m 0700 -p '
- \ . shellescape(expand(s:backupdir))
- elseif has('win32') || has('win64')
- silent! execute '!mkdir '
- \ . shellescape(expand(s:backupdir))
+ elseif has('*shellescape')
+ if has('unix')
+ silent! execute '!mkdir -m 0700 -p '
+ \ . shellescape(expand(s:backupdir))
+ elseif has('win32') || has('win64')
+ silent! execute '!mkdir '
+ \ . shellescape(expand(s:backupdir))
+ endif
endif
endif
diff --git a/vim/plugin/auto_swapdir.vim b/vim/plugin/auto_swapdir.vim
index b5f9ce3a..7d5940aa 100644
--- a/vim/plugin/auto_swapdir.vim
+++ b/vim/plugin/auto_swapdir.vim
@@ -18,7 +18,7 @@ else
" This is imperfect in that it will break if you have a backslashed comma in
" the first component of your &runtimepath, but if you're doing that, you
" probably already have way bigger problems
- let s:swapdir
+ let s:swapdir
\ = strpart(&runtimepath, 0, stridx(&runtimepath, ','))
\ . '/swap'
endif
@@ -32,12 +32,14 @@ if !isdirectory(expand(s:swapdir))
" Failing that, use an OS-dependent command
" (Fortunately, Unix and Windows are the only OS types in the world)
- elseif has('unix')
- silent! execute '!mkdir -m 0700 -p '
- \ . shellescape(expand(s:swapdir))
- elseif has('win32') || has('win64')
- silent! execute '!mkdir '
- \ . shellescape(expand(s:swapdir))
+ elseif has('*shellescape')
+ if has('unix')
+ silent! execute '!mkdir -m 0700 -p '
+ \ . shellescape(expand(s:swapdir))
+ elseif has('win32') || has('win64')
+ silent! execute '!mkdir '
+ \ . shellescape(expand(s:swapdir))
+ endif
endif
endif
diff --git a/vim/plugin/auto_undodir.vim b/vim/plugin/auto_undodir.vim
index cf8d896a..0cd54cd0 100644
--- a/vim/plugin/auto_undodir.vim
+++ b/vim/plugin/auto_undodir.vim
@@ -21,7 +21,7 @@ else
" This is imperfect in that it will break if you have a backslashed comma in
" the first component of your &runtimepath, but if you're doing that, you
" probably already have way bigger problems
- let s:undodir
+ let s:undodir
\ = strpart(&runtimepath, 0, stridx(&runtimepath, ','))
\ . '/undo'
endif
@@ -35,12 +35,14 @@ if !isdirectory(expand(s:undodir))
" Failing that, use an OS-dependent command
" (Fortunately, Unix and Windows are the only OS types in the world)
- elseif has('unix')
- silent! execute '!mkdir -m 0700 -p '
- \ . shellescape(expand(s:undodir))
- elseif has('win32') || has('win64')
- silent! execute '!mkdir '
- \ . shellescape(expand(s:undodir))
+ elseif has('*shellescape')
+ elseif has('unix')
+ silent! execute '!mkdir -m 0700 -p '
+ \ . shellescape(expand(s:undodir))
+ elseif has('win32') || has('win64')
+ silent! execute '!mkdir '
+ \ . shellescape(expand(s:undodir))
+ endif
endif
endif
diff --git a/vim/plugin/mail_mutt.vim b/vim/plugin/mail_mutt.vim
index 5170fb52..63cae2f6 100644
--- a/vim/plugin/mail_mutt.vim
+++ b/vim/plugin/mail_mutt.vim
@@ -37,7 +37,7 @@ endfunction
" Create a command to wrap around that function
command -nargs=0 -range=%
- \ MailMutt
+ \ MailMutt
\ call <SID>MailMutt(<line1>, <line2>)
" Mapping to mail current line in normal mode
diff --git a/vim/vimrc b/vim/vimrc
index eab24946..a44c5d2f 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -1,3 +1,9 @@
+" Use different keys for global and local leaders
+if has('eval')
+ let g:mapleader = '\'
+ let g:maplocalleader = '_'
+endif
+
" Load configuration files from ~/.vim/config or its analogue, before Pathogen
" loads all its directories into 'runtimepath'
runtime! config/*.vim