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=27cdfd5ef2ae857084d9912b90da9ebccacdb6d4 The branch, branch-1_4 has been updated via 27cdfd5ef2ae857084d9912b90da9ebccacdb6d4 (commit) via f6b76e6933a59d5034cb198ff1dd96e33ad54ede (commit) from c75314631bbd077c347f49c74982d4b1fa2f66c2 (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 27cdfd5ef2ae857084d9912b90da9ebccacdb6d4 Author: Eric Blake <[EMAIL PROTECTED]> Date: Mon Feb 11 08:49:30 2008 -0700 Document behavior of __gnu__(). * doc/m4.texinfo (Platform macros): Enhance test. (Macro expansion): New test. Signed-off-by: Eric Blake <[EMAIL PROTECTED]> commit f6b76e6933a59d5034cb198ff1dd96e33ad54ede Author: Eric Blake <[EMAIL PROTECTED]> Date: Mon Feb 11 08:32:35 2008 -0700 Use gnulib's git-merge-changelog driver when available. * .gitattributes: New file. * bootstrap: Install driver, if not already present. Signed-off-by: Eric Blake <[EMAIL PROTECTED]> ----------------------------------------------------------------------- Summary of changes: .gitattributes | 1 + ChangeLog | 12 +++++++++++- bootstrap | 17 +++++++++++++++-- doc/m4.texinfo | 35 +++++++++++++++++++++++++++++++++-- 4 files changed, 60 insertions(+), 5 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..e8495d5 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +ChangeLog merge=merge-changelog diff --git a/ChangeLog b/ChangeLog index 8d76e5e..099d643 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2008-02-11 Eric Blake <[EMAIL PROTECTED]> + + Document behavior of __gnu__(). + * doc/m4.texinfo (Platform macros): Enhance test. + (Macro expansion): New test. + + Use gnulib's git-merge-changelog driver when available. + * .gitattributes: New file. + * bootstrap: Install driver, if not already present. + 2008-02-06 Eric Blake <[EMAIL PROTECTED]> Fix security hole introduced 2007-11-22. @@ -18,7 +28,7 @@ argument of a $@ at a time; but the penalties of this patch make it easier to manage $@ efficiently in future patches. Memory impact: noticeable penalty, due to larger struct and O(n) - to O(n^2) on unboxed recursion + to O(n^2) on unboxed recursion. Speed impact: noticeable penalty, due to more bookkeeping. * src/m4.h (struct token_chain): Add comma and quotes fields. (arg_adjust_refcount, arg_print, push_arg_quote): New prototypes. diff --git a/bootstrap b/bootstrap index 686434c..dec9499 100755 --- a/bootstrap +++ b/bootstrap @@ -1,9 +1,9 @@ #! /bin/sh -# bootstrap (GNU M4) version 2007-11-05 +# bootstrap (GNU M4) version 2008-02-11 # Written by Gary V. Vaughan <[EMAIL PROTECTED]> -# Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This file is part of GNU M4. # @@ -230,6 +230,19 @@ EOF cp $config_macro_dir/.cvsignore $config_macro_dir/.gitignore fi +# See if we can use gnulib's git-merge-changelog merge driver. +if test -d .git && (git --version) >/dev/null 2>/dev/null ; then + if git config merge.merge-changelog.driver >/dev/null ; then + : + elif (git-merge-changelog --version) >/dev/null 2>/dev/null ; then + func_echo "initializing git-merge-changelog driver" + git config merge.merge-changelog.name 'GNU-style ChangeLog merge driver' + git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B' + else + func_echo "consider installing git-merge-changelog from gnulib" + fi +fi + ## ---------------------------- ## ## Find the gnulib module tree. ## ## ---------------------------- ## diff --git a/doc/m4.texinfo b/doc/m4.texinfo index dc33620..2da5709 100644 --- a/doc/m4.texinfo +++ b/doc/m4.texinfo @@ -1617,6 +1617,22 @@ foo will expand first to @samp{bar}, and when this is reread and expanded, into @samp{Hello}. [EMAIL PROTECTED] [EMAIL PROTECTED] not worth documenting, but test that the command line can [EMAIL PROTECTED] define macros that take parameters + [EMAIL PROTECTED] options: -Dfoo -Decho=$@ [EMAIL PROTECTED] +$ @kbd{m4 -Dfoo -Decho='$@'} +foo [EMAIL PROTECTED] +foo(`silently ignored') [EMAIL PROTECTED] +echo(`1', `2') [EMAIL PROTECTED],2 [EMAIL PROTECTED] example [EMAIL PROTECTED] ignore + @node Definitions @chapter How to define new macros @@ -5734,7 +5750,8 @@ their existence will confirm platform details. @deffnx {Optional builtin} windows Each of these macros is conditionally defined as needed to describe the environment of @code{m4}. If defined, each macro expands to the empty -string. +string. For now, these macros silently ignore all arguments, but in a +future release of M4, they might warn if arguments are present. @end deffn When @acronym{GNU} extensions are in effect (that is, when you did not @@ -5743,12 +5760,26 @@ use the @option{-G} option, @pxref{Limits control, , Invoking m4}), expand to the empty string. @example +$ @kbd{m4} __gnu__ @result{} -ifdef(`__gnu__', `Extensions are active') +__gnu__(`ignored') [EMAIL PROTECTED] +Extensions are ifdef(`__gnu__', `active', `inactive') @result{}Extensions are active @end example [EMAIL PROTECTED] options: -G [EMAIL PROTECTED] +$ @kbd{m4 -G} +__gnu__ [EMAIL PROTECTED] +__gnu__(`ignored') [EMAIL PROTECTED](ignored) +Extensions are ifdef(`__gnu__', `active', `inactive') [EMAIL PROTECTED] are inactive [EMAIL PROTECTED] example + On UNIX systems, @acronym{GNU} @code{m4} will define @[EMAIL PROTECTED] by default, or @code{unix} when the @option{-G} option is specified. hooks/post-receive -- GNU M4 source repository
