[Groff-commit] groff/contrib/gdiffmk ChangeLog gdiffmk.man gdi...

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Branch:         
Changes by:     Werner LEMBERG <address@hidden> 05/01/16 23:08:26

Modified files:
        contrib/gdiffmk: ChangeLog gdiffmk.man gdiffmk.sh 

Log message:
        * gdiffmk.sh (Usage): Fix typos.
        <top>: Allow `-M<arg1> <arg2>' also.
        
        * gdiffmk.man: Updated.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/ChangeLog.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/gdiffmk.man.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/gdiffmk.sh.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: groff/contrib/gdiffmk/ChangeLog
diff -u groff/contrib/gdiffmk/ChangeLog:1.9 groff/contrib/gdiffmk/ChangeLog:1.10
--- groff/contrib/gdiffmk/ChangeLog:1.9 Sun Jan 16 01:43:21 2005
+++ groff/contrib/gdiffmk/ChangeLog     Sun Jan 16 23:08:26 2005
@@ -1,3 +1,10 @@
+2005-01-16  Mike Bianchi  <address@hidden>
+
+       * gdiffmk.sh (Usage): Fix typos.
+       <top>: Allow `-M<arg1> <arg2>' also.
+
+       * gdiffmk.man: Updated.
+
 2005-01-13  Mike Bianchi  <address@hidden>
 
        * gdiffmk.sh: Add the -D, -M, and -B options, which provide actions
Index: groff/contrib/gdiffmk/gdiffmk.man
diff -u groff/contrib/gdiffmk/gdiffmk.man:1.5 
groff/contrib/gdiffmk/gdiffmk.man:1.6
--- groff/contrib/gdiffmk/gdiffmk.man:1.5       Sun Jan 16 01:43:21 2005
+++ groff/contrib/gdiffmk/gdiffmk.man   Sun Jan 16 23:08:26 2005
@@ -46,7 +46,7 @@
 [\ \c
 .B \-D
 .OP \-B
-.OP \-M "\ mark1 mark2"
+.OP \-M "mark1 mark2"
 ]
 .OP \-x \%diffcmd
 .OP \-\-
@@ -153,7 +153,7 @@
 .BR "[[" " .\&.\&.\&. " "]]" .
 .
 .TP
-.BI \-M " mark1 mark2
+.BI \-M "mark1 mark2"
 Change the delimiting marks for the
 .B \-D
 option.
Index: groff/contrib/gdiffmk/gdiffmk.sh
diff -u groff/contrib/gdiffmk/gdiffmk.sh:1.5 
groff/contrib/gdiffmk/gdiffmk.sh:1.6
--- groff/contrib/gdiffmk/gdiffmk.sh:1.5        Sun Jan 16 01:43:21 2005
+++ groff/contrib/gdiffmk/gdiffmk.sh    Sun Jan 16 23:08:26 2005
@@ -49,8 +49,8 @@
   -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 @@
        -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=.