[SCM] GNU M4 source repository branch, branch-1.4, updated. v1.4.17-7-gf5ef8cf

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU M4 source repository".

http://git.sv.gnu.org/gitweb/?p=m4.git;a=commitdiff;h=f5ef8cf7b90a1400b7955904a82814edb2a7d71e

The branch, branch-1.4 has been updated
       via  f5ef8cf7b90a1400b7955904a82814edb2a7d71e (commit)
      from  12d9ca5eef1e839aa61f7e821fa4b2bee4c63d23 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f5ef8cf7b90a1400b7955904a82814edb2a7d71e
Author: Eric Blake <[email protected]>
Date:   Tue May 13 15:34:30 2014 -0600

    doc: fix line-wrapped macro definitions
    
    The html rendering of the manual ate a comma and inserted an
    awkward line wrap for the "example" macro prototype:
    https://www.gnu.org/software/m4/manual/m4-1.4.17/html_node/Manual.html
    
    As documented in autoconf, use of @c does not work for macros
    which are designed for inline use within @deffn and friends.
    http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=a357718
    
    * doc/m4.texi: Drop bogus @c.
    Reported by Marijn Schouten, fix by Patrice Dumas copied from
    autoconf code base.
    
    Signed-off-by: Eric Blake <[email protected]>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog   |    7 +++++++
 doc/m4.texi |    4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9b865cf..5643bea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-05-13  Eric Blake  <[email protected]>
+
+	doc: fix line-wrapped macro definitions
+	* doc/m4.texi: Drop bogus @c.
+	Reported by Marijn Schouten, fix by Patrice Dumas copied from
+	autoconf code base.
+
 2014-02-05  Vitezslav Crhonek  <[email protected]>  (tiny change)
 
 	main: diagnose unsupported --word-regexp
diff --git a/doc/m4.texi b/doc/m4.texi
index 1f14290..2960cff 100644
--- a/doc/m4.texi
+++ b/doc/m4.texi
@@ -23,7 +23,7 @@
 @c The ARG is an optional argument.  To be used for macro arguments in
 @c their documentation (@defmac).
 @macro ovar{varname}
-@r{[}@var{\varname\}@r{]}@c
+@r{[}@var{\varname\}@r{]}
 @end macro
 
 @c @dvar{ARG, DEFAULT}
@@ -31,7 +31,7 @@
 @c The ARG is an optional argument, defaulting to DEFAULT.  To be used
 @c for macro arguments in their documentation (@defmac).
 @macro dvar{varname, default}
-@r{[}@var{\varname\} = @samp{\default\}@r{]}@c
+@r{[}@var{\varname\} = @samp{\default\}@r{]}
 @end macro
 
 @comment %**end of header


hooks/post-receive
-- 
GNU M4 source repository