[SCM] GNU M4 source repository branch, branch-1.4, updated. v1.4.17-6-g12d9ca5

[Eric Blake]

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=12d9ca5eef1e839aa61f7e821fa4b2bee4c63d23

The branch, branch-1.4 has been updated
       via  12d9ca5eef1e839aa61f7e821fa4b2bee4c63d23 (commit)
      from  cf5cbd26d6134540c66e7a68f4de36471fe9c995 (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 12d9ca5eef1e839aa61f7e821fa4b2bee4c63d23
Author: Vitezslav Crhonek <address@hidden>
Date:   Wed Feb 5 14:58:28 2014 +0100

    main: diagnose unsupported --word-regexp
    
    The long option for -W (--word-regexp) was accepted without
    ENABLE_CHANGEWORD defined.
    
    * src/m4.c (long_options): Don't allow long option if short option
    is rejected.
    * THANKS: Add attribution.
    
    Signed-off-by: Eric Blake <address@hidden>

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

Summary of changes:
 ChangeLog |    6 ++++++
 THANKS    |    1 +
 src/m4.c  |    2 ++
 3 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a639917..9b865cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-02-05  Vitezslav Crhonek  <address@hidden>  (tiny change)
+
+       main: diagnose unsupported --word-regexp
+       * src/m4.c (long_options): Don't allow long option if short option
+       is rejected.
+
 2014-01-01  Eric Blake  <address@hidden>
 
        maint: bump copyright year
diff --git a/THANKS b/THANKS
index eaefbba..5e4b3ee 100644
--- a/THANKS
+++ b/THANKS
@@ -129,6 +129,7 @@ Tom Tromey              address@hidden
 Ulrich Drepper          address@hidden
 Vern Paxson             address@hidden
 Vincent Lonngren        address@hidden
+Vitezslav Crhonek       address@hidden
 Vivek P. Singhal        address@hidden
 Walter Wong             address@hidden
 
diff --git a/src/m4.c b/src/m4.c
index db77288..9907f0b 100644
--- a/src/m4.c
+++ b/src/m4.c
@@ -307,7 +307,9 @@ static const struct option long_options[] =
   {"trace", required_argument, NULL, 't'},
   {"traditional", no_argument, NULL, 'G'},
   {"undefine", required_argument, NULL, 'U'},
+#ifdef ENABLE_CHANGEWORD
   {"word-regexp", required_argument, NULL, 'W'},
+#endif
 
   {"debugfile", optional_argument, NULL, DEBUGFILE_OPTION},
   {"diversions", required_argument, NULL, DIVERSIONS_OPTION},


hooks/post-receive
-- 
GNU M4 source repository