[SCM] GNU M4 source repository branch, branch-1.6, updated. v1.5.89a-51-gb882977

[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=b8829779ba82826040f16fe78420f0e5a2fe881e

The branch, branch-1.6 has been updated
       via  b8829779ba82826040f16fe78420f0e5a2fe881e (commit)
      from  5486ea031b1196f5ade5d4292b83f057c1f38ea6 (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 b8829779ba82826040f16fe78420f0e5a2fe881e
Author: Eric Blake <address@hidden>
Date:   Mon Aug 18 09:43:32 2008 -0600

    Remove deprecated -N option; fixes a regression from 2006-09-14.
    
    * src/m4.c (DIVERSIONS_OPTION): Delete.
    (long_options, OPTSTRING): Remove -N/--diversions option.
    (main): Remove code that caused assertion failure.
    * doc/m4.texinfo (Limits control): Remove it from the manual.
    * NEWS: Mention that it is gone.
    
    Signed-off-by: Eric Blake <address@hidden>

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

Summary of changes:
 ChangeLog      |    9 +++++++++
 NEWS           |    3 +++
 doc/m4.texinfo |    8 --------
 src/m4.c       |   12 ++----------
 4 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4fe7570..533bc55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-08-18  Eric Blake  <address@hidden>
+
+       Remove deprecated -N option; fixes a regression from 2006-09-14.
+       * src/m4.c (DIVERSIONS_OPTION): Delete.
+       (long_options, OPTSTRING): Remove -N/--diversions option.
+       (main): Remove code that caused assertion failure.
+       * doc/m4.texinfo (Limits control): Remove it from the manual.
+       * NEWS: Mention that it is gone.
+
 2008-08-15  Eric Blake  <address@hidden>
 
        Improve 'git diff' of manual source.
diff --git a/NEWS b/NEWS
index fe6f9e8..77472fe 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,9 @@ Foundation, Inc.
 *** Comments that contain unbalanced quotes were not rescanned correctly
     when passed through address@hidden
 
+** Remove the undocumented command-line option '-N', as no one complained
+   about the assertion failure regression that it introduced in 1.4.7.
+
 ** Fix the `m4wrap' builtin to accumulate wrapped text in FIFO order, as
    required by POSIX.  The manual mentions a way to restore the LIFO order
    present in earlier GNU M4 versions.  NOTE: this change exposes a bug
diff --git a/doc/m4.texinfo b/doc/m4.texinfo
index c9001bc..bfb6108 100644
--- a/doc/m4.texinfo
+++ b/doc/m4.texinfo
@@ -807,14 +807,6 @@ problem in general, if not undecidable!
 These options are present for compatibility with System V @code{m4}, but
 do nothing in this implementation.  They may disappear in future
 releases, and issue a warning to that effect.
-
address@hidden -N @var{NUM}
address@hidden address@hidden
-These options are present only for compatibility with previous
-versions of @acronym{GNU} @code{m4}, and were controlling the number of
-possible diversions which could be used at the same time.  They do nothing,
-because there is no fixed limit anymore.  They may disappear in future
-releases, and issue a warning to that effect.
 @end table
 
 @node Frozen state
diff --git a/src/m4.c b/src/m4.c
index 1bb1ec7..73ccce1 100644
--- a/src/m4.c
+++ b/src/m4.c
@@ -308,7 +308,6 @@ mismatch, or whatever value was passed to the m4exit 
macro.\n\
 enum
 {
   DEBUGFILE_OPTION = CHAR_MAX + 1,     /* no short opt */
-  DIVERSIONS_OPTION,                   /* not quite -N, because of message */
   WARN_MACRO_SEQUENCE_OPTION,          /* no short opt */
 
   HELP_OPTION,                         /* no short opt */
@@ -339,7 +338,6 @@ static const struct option long_options[] =
   {"word-regexp", required_argument, NULL, 'W'},
 
   {"debugfile", required_argument, NULL, DEBUGFILE_OPTION},
-  {"diversions", required_argument, NULL, DIVERSIONS_OPTION},
   {"warn-macro-sequence", optional_argument, NULL, WARN_MACRO_SEQUENCE_OPTION},
 
   {"help", no_argument, NULL, HELP_OPTION},
@@ -385,9 +383,9 @@ process_file (const char *name)
    '-' forces getopt_long to hand back file names as arguments to opt
    '\1', rather than reordering the command line.  */
 #ifdef ENABLE_CHANGEWORD
-#define OPTSTRING "-B:D:EF:GH:I:L:N:PQR:S:T:U:W:d::egil:o:st:"
+#define OPTSTRING "-B:D:EF:GH:I:L:PQR:S:T:U:W:d::egil:o:st:"
 #else
-#define OPTSTRING "-B:D:EF:GH:I:L:N:PQR:S:T:U:d::egil:o:st:"
+#define OPTSTRING "-B:D:EF:GH:I:L:PQR:S:T:U:d::egil:o:st:"
 #endif
 
 #ifdef DEBUG_REGEX
@@ -455,12 +453,6 @@ main (int argc, char *const *argv, char *const *envp)
               optchar);
        break;
 
-      case 'N':
-      case DIVERSIONS_OPTION:
-       /* -N became an obsolete no-op in 1.4.x.  */
-       error (0, 0, "Warning: `m4 %s' is deprecated",
-              optchar == 'N' ? "-N" : "--diversions");
-
       case 'D':
       case 'U':
       case 's':


hooks/post-receive
--
GNU M4 source repository