[SCM] GNU M4 source repository branch, branch-1.4, updated. v1.4.11-40-g349bbb7

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=349bbb7400ee079878cb5859ee850a2b34a74c40

The branch, branch-1.4 has been updated
       via  349bbb7400ee079878cb5859ee850a2b34a74c40 (commit)
      from  8eb84b42e32728a5abd8623012a9b95605ed0a35 (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 349bbb7400ee079878cb5859ee850a2b34a74c40
Author: Eric Blake <[email protected]>
Date:   Thu Aug 21 06:50:50 2008 -0600

    Fix crash with traced defn(undef), regression from 2007-08-09.
    
    * src/builtin.c (m4_defn): Handle traced but undefined macros.
    * doc/m4.texinfo (Trace): Test it.
    * NEWS: Document it.
    
    Signed-off-by: Eric Blake <[email protected]>

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

Summary of changes:
 ChangeLog      |    7 +++++++
 doc/m4.texinfo |    4 +++-
 src/builtin.c  |    4 ++++
 3 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 51b3165..8c55d2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-21  Eric Blake  <[email protected]>
+
+	Fix crash with traced defn(undef), regression from 2007-08-09.
+	* src/builtin.c (m4_defn): Handle traced but undefined macros.
+	* doc/m4.texinfo (Trace): Test it.
+	* NEWS: Document it.
+
 2008-08-18  Eric Blake  <[email protected]>
 
 	Fix crash with 'm4 -N9', regression from 2006-09-14.
diff --git a/doc/m4.texinfo b/doc/m4.texinfo
index d232c36..8ec4478 100644
--- a/doc/m4.texinfo
+++ b/doc/m4.texinfo
@@ -3553,6 +3553,8 @@ traceon(`foo')
 @result{}
 foo
 @result{}foo
+defn(`foo')
+@result{}
 define(`foo', `bar')
 @result{}
 foo
@@ -3563,7 +3565,7 @@ undefine(`foo')
 ifdef(`foo', `yes', `no')
 @result{}no
 indir(`foo')
-@error{}m4:stdin:8: undefined macro `foo'
+@error{}m4:stdin:9: undefined macro `foo'
 @result{}
 define(`foo', `blah')
 @result{}
diff --git a/src/builtin.c b/src/builtin.c
index 450b725..5ea886d 100644
--- a/src/builtin.c
+++ b/src/builtin.c
@@ -922,6 +922,10 @@ builtin `%s' requested by frozen file is not supported", ARG (i)));
 	    push_macro (b);
 	  break;
 
+	case TOKEN_VOID:
+	  /* Nothing to do for traced but undefined macro.  */
+	  break;
+
 	default:
 	  M4ERROR ((warning_status, 0,
 		    "INTERNAL ERROR: bad symbol type in m4_defn ()"));


hooks/post-receive
--
GNU M4 source repository