Merge branch 'maint'

* maint:
diff --check: fix off by one error
spurious .sp in manpages

diff --cc diff.c
Simple merge