diff options
| author | wl <wl> | 2005-01-16 23:08:26 +0000 |
|---|---|---|
| committer | wl <wl> | 2005-01-16 23:08:26 +0000 |
| commit | d2d50c8448bc8bfb814ee1181f714fe23c3cff37 (patch) | |
| tree | a5aba4ff115ff19923591169aae9a6238aa5ee1e | |
| parent | f3c2b628c51d752ac48a7bf3f1f55f53bb8e0360 (diff) | |
| download | groff-d2d50c8448bc8bfb814ee1181f714fe23c3cff37.tar.gz | |
* gdiffmk.sh (Usage): Fix typos.
<top>: Allow `-M<arg1> <arg2>' also.
* gdiffmk.man: Updated.
| -rw-r--r-- | contrib/gdiffmk/ChangeLog | 7 | ||||
| -rw-r--r-- | contrib/gdiffmk/gdiffmk.man | 4 | ||||
| -rw-r--r-- | contrib/gdiffmk/gdiffmk.sh | 16 |
3 files changed, 19 insertions, 8 deletions
diff --git a/contrib/gdiffmk/ChangeLog b/contrib/gdiffmk/ChangeLog index 44884e78..f8e3f963 100644 --- a/contrib/gdiffmk/ChangeLog +++ b/contrib/gdiffmk/ChangeLog @@ -1,3 +1,10 @@ +2005-01-16 Mike Bianchi <MBianchi@Foveal.com> + + * gdiffmk.sh (Usage): Fix typos. + <top>: Allow `-M<arg1> <arg2>' also. + + * gdiffmk.man: Updated. + 2005-01-13 Mike Bianchi <MBianchi@Foveal.com> * gdiffmk.sh: Add the -D, -M, and -B options, which provide actions diff --git a/contrib/gdiffmk/gdiffmk.man b/contrib/gdiffmk/gdiffmk.man index e00fd45b..d71b1658 100644 --- a/contrib/gdiffmk/gdiffmk.man +++ b/contrib/gdiffmk/gdiffmk.man @@ -46,7 +46,7 @@ gdiffmk \- mark differences between groff/nroff/troff files [\ \c .B \-D .OP \-B -.OP \-M "\ mark1 mark2" +.OP \-M "mark1 mark2" ] .OP \-x \%diffcmd .OP \-\- @@ -153,7 +153,7 @@ Default delimiting marks: .BR "[[" " .\&.\&.\&. " "]]" . . .TP -.BI \-M " mark1 mark2 +.BI \-M "mark1 mark2" Change the delimiting marks for the .B \-D option. diff --git a/contrib/gdiffmk/gdiffmk.sh b/contrib/gdiffmk/gdiffmk.sh index 37879235..85acbe9c 100644 --- a/contrib/gdiffmk/gdiffmk.sh +++ b/contrib/gdiffmk/gdiffmk.sh @@ -49,8 +49,8 @@ OPTIONS: -D Show the deleted portions from changed and deleted text. Default delimiting marks: \`[[' .... \`]]'. -B By default, the deleted texts marked by the \`-D' option end - with an added troff \`.br\' command. This option prevents - the added \`.br\'. + with an added troff \`.br' command. This option prevents + the added \`.br'. -M MARK1 MARK2 Change the delimiting marks for the \`-D' option. -x DIFFCMD Use a different diff(1) command; @@ -179,11 +179,15 @@ do -D ) D_option=D_option ;; - -M ) - shift - MARK1=$1 + -M* ) + MARK1=$( RequiresArgument "${OPTION}" $2 ) && + shift + if [ $# -lt 2 ] + then + Usage "Option \`-M' is missing the MARK2 value." + fi + MARK2=$2 shift - MARK2=$1 ;; -B ) br=. |