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

[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=6a95d853eb3c7493345ea093e8efa9f35a49c143

The branch, branch-1.6 has been updated
       via  6a95d853eb3c7493345ea093e8efa9f35a49c143 (commit)
      from  df6bfeeaac6bdc1ef8e5406c6ac051af2c10d0d8 (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 6a95d853eb3c7493345ea093e8efa9f35a49c143
Author: Eric Blake <address@hidden>
Date:   Tue Dec 23 17:07:47 2008 -0700

    Issue deprecation warning for -o/--error-output.
    
    * src/m4.c (main): Add warning for deprecated option.
    * doc/m4.texinfo (Debugging options): Document the change.
    * NEWS: Likewise.
    
    Signed-off-by: Eric Blake <address@hidden>

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

Summary of changes:
 ChangeLog      |    5 +++++
 NEWS           |    6 ++++++
 doc/m4.texinfo |   17 ++++++++++++-----
 src/m4.c       |   11 ++++++-----
 4 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ef11ce4..7f3bde2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-12-23  Eric Blake  <address@hidden>
 
+       Issue deprecation warning for -o/--error-output.
+       * src/m4.c (main): Add warning for deprecated option.
+       * doc/m4.texinfo (Debugging options): Document the change.
+       * NEWS: Likewise.
+
        Add debugmode(o) to control dumpdef output location.
        * src/m4.h (DEBUG_TRACE_OUTPUT_DUMPDEF): New macro.
        (DEBUG_TRACE_VERBOSE): Update.
diff --git a/NEWS b/NEWS
index 45664c8..ebd2cbb 100644
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,12 @@ Foundation, Inc.
 ** Remove the undocumented command-line option '-N', as no one complained
    about the assertion failure regression that it introduced in 1.4.7.
 
+** The `-o'/`--error-output' command-line options, which were replaced by
+   `--debugfile' in 1.4.7, now issue a deprecation warning.  This warning
+   harmlessly triggers with versions of Autoconf 2.60 and earlier, but can
+   be silenced by applying this patch:
+     http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=714eeee87
+
 ** 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 9e5b07c..2ab7290 100644
--- a/doc/m4.texinfo
+++ b/doc/m4.texinfo
@@ -936,11 +936,10 @@ debug output goes to standard error; if @var{file} is the 
empty string,
 debug output is discarded.  @xref{Debugfile}, for more details.  The
 option @option{--debugfile} may be given more than once, and order is
 significant with respect to file names.  The spellings @option{-o} and
address@hidden are misleading and inconsistent with other
address@hidden tools; for now they are silently accepted as synonyms of
address@hidden and only recognized once, but in a future version
-of M4, using them will cause a warning to be issued.
address@hidden FIXME make them warn in m4 1.6
address@hidden are misleading and
+inconsistent with other @acronym{GNU} tools; using those spellings will
+evoke a warning, and they may be withdrawn or change semantics in a
+future release.
 
 @ignore
 @comment not worth including in the manual, but provides a good test
@@ -957,6 +956,14 @@ bar
 @error{}m4trace: -1- bar -> `hello'
 @result{}hello
 @end example
+
address@hidden options: -o /dev/null
address@hidden
+$ @kbd{m4 -o /dev/null
address@hidden: Warning: `-o' is deprecated, use `--debugfile' instead
+dumpdef(`divnum')
address@hidden
address@hidden example
 @end ignore
 
 @item -l @var{num}
diff --git a/src/m4.c b/src/m4.c
index 1206761..8d0221f 100644
--- a/src/m4.c
+++ b/src/m4.c
@@ -541,7 +541,8 @@ main (int argc, char *const *argv, char *const *envp)
        break;
 
       case 'e':
-       error (0, 0, "Warning: `m4 -e' is deprecated, use `-i' instead");
+       error (0, 0, _("Warning: `%s' is deprecated, use `%s' instead"),
+                      "-e", "-i");
        /* fall through */
       case 'i':
        interactive = true;
@@ -560,10 +561,10 @@ main (int argc, char *const *argv, char *const *envp)
 
       case 'o':
        /* -o/--error-output are deprecated synonyms of --debugfile,
-          but don't issue a deprecation warning until autoconf 2.61
-          or later is more widely established, as such a warning
-          would interfere with all earlier versions of autoconf.  */
-       /* Don't call debug_set_output here, as it has side effects.  */
+          so issue a warning.  Don't call debug_set_output here, as
+          it has side effects.  */
+       error (0, 0, _("Warning: `%s' is deprecated, use `%s' instead"),
+              optchar == 'o' ? "-o" : "--error-output", "--debugfile");
        debugfile = optarg;
        break;
 


hooks/post-receive
--
GNU M4 source repository