===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/m4/m4.1,v
retrieving revision 1.32
retrieving revision 1.33
diff -c -r1.32 -r1.33
*** src/usr.bin/m4/m4.1	2003/06/10 09:12:10	1.32
--- src/usr.bin/m4/m4.1	2003/06/27 21:22:52	1.33
***************
*** 1,4 ****
! .\"	@(#) $OpenBSD: m4.1,v 1.32 2003/06/10 09:12:10 jmc Exp $
  .\"
  .\" Copyright (c) 1989, 1993
  .\"	The Regents of the University of California.  All rights reserved.
--- 1,4 ----
! .\"	@(#) $OpenBSD: m4.1,v 1.33 2003/06/27 21:22:52 jmc Exp $
  .\"
  .\" Copyright (c) 1989, 1993
  .\"	The Regents of the University of California.  All rights reserved.
***************
*** 61,67 ****
  .Pp
  There cannot be any space following the macro name and the open
  parenthesis
! .Pq Ql ( .
  If the macro name is not followed by an open
  parenthesis it is processed with no arguments.
  .Pp
--- 61,67 ----
  .Pp
  There cannot be any space following the macro name and the open
  parenthesis
! .Pq Sq ( .
  If the macro name is not followed by an open
  parenthesis it is processed with no arguments.
  .Pp
***************
*** 71,81 ****
  .Dq [a-zA-Z_][a-zA-Z0-9_]* .
  .Pp
  In arguments to macros, leading unquoted space, tab, and newline
! .Pq Ql \en
  characters are ignored.
! To quote strings, use left and right single
! quotes (e.g.,
! .Ql "\ this is a string with a leading space" ) .
  You can change the quote characters with the
  .Ic changequote
  built-in macro.
--- 71,82 ----
  .Dq [a-zA-Z_][a-zA-Z0-9_]* .
  .Pp
  In arguments to macros, leading unquoted space, tab, and newline
! .Pq Sq \en
  characters are ignored.
! To quote strings, use left and right single quotes
! .Po e.g.,\ \&
! .Sq "\ this is a string with a leading space"
! .Pc .
  You can change the quote characters with the
  .Ic changequote
  built-in macro.
***************
*** 153,159 ****
  .It Ic changecom
  Change the start and end comment sequences.
  The default is the pound sign
! .Pq Ql #
  and the newline character.
  With no arguments comments are turned off.
  The maximum length for a comment marker is five characters.
--- 154,160 ----
  .It Ic changecom
  Change the start and end comment sequences.
  The default is the pound sign
! .Pq Sq #
  and the newline character.
  With no arguments comments are turned off.
  The maximum length for a comment marker is five characters.
***************
*** 169,190 ****
  Define a new macro named by the first argument to have the
  value of the second argument.
  Each occurrence of
! .Ql $n
  (where
  .Ar n
  is 0 through 9) is replaced by the
  .Ar n Ns 'th
  argument.
! .Ql $0
  is the name of the calling macro.
  Undefined arguments are replaced by a null string.
! .Ql $#
  is replaced by the number of arguments;
! .Ql $*
  is replaced by all arguments comma separated;
! .Ql $@
  is the same as
! .Ql $*
  but all arguments are quoted against further expansion.
  .It Ic defn
  Returns the quoted definition for each argument.
--- 170,191 ----
  Define a new macro named by the first argument to have the
  value of the second argument.
  Each occurrence of
! .Sq $n
  (where
  .Ar n
  is 0 through 9) is replaced by the
  .Ar n Ns 'th
  argument.
! .Sq $0
  is the name of the calling macro.
  Undefined arguments are replaced by a null string.
! .Sq $#
  is replaced by the number of arguments;
! .Sq $*
  is replaced by all arguments comma separated;
! .Sq $@
  is the same as
! .Sq $*
  but all arguments are quoted against further expansion.
  .It Ic defn
  Returns the quoted definition for each argument.
***************
*** 212,218 ****
  .It Ic esyscmd
  Passes its first argument to a shell and returns the shell's standard output.
  Note that the shell shares its standard input and standard error with
! .Nm
  .It Ic eval
  Computes the first argument as an arithmetic expression using 32-bit
  arithmetic.
--- 213,219 ----
  .It Ic esyscmd
  Passes its first argument to a shell and returns the shell's standard output.
  Note that the shell shares its standard input and standard error with
! .Nm m4 .
  .It Ic eval
  Computes the first argument as an arithmetic expression using 32-bit
  arithmetic.
***************
*** 294,305 ****
  .It Ic patsubst
  Substitutes a regular expression in a string with a replacement string.
  Usual substitution patterns apply: an ampersand
! .Pq Ql &
  is replaced by the string matching the regular expression.
  The string
! .Ql \e# ,
  where
! .Ql #
  is a digit, is replaced by the corresponding back-reference.
  .It Ic popdef
  Restores the
--- 295,306 ----
  .It Ic patsubst
  Substitutes a regular expression in a string with a replacement string.
  Usual substitution patterns apply: an ampersand
! .Pq Sq \&&
  is replaced by the string matching the regular expression.
  The string
! .Sq \e# ,
  where
! .Sq #
  is a digit, is replaced by the corresponding back-reference.
  .It Ic popdef
  Restores the