branch-1_4 deprecated options

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

I was looking at debian bug 5898
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=5898, which suggested
adding --secure (although I think the name --safer or --restricted is
better than --secure).  But would it help to have a short option name?  -s
is already taken for --synclines, as is -r (similar to -r for
restricted-mode shells) for --regexp-syntax.  I thought of -S, but right
now we are silently using -Sint as a compatibility option for Solaris m4,
and changing it to no longer take an argument is incompatible.  But since
we aren't doing anything with the current -S, and since I added -B for
- --prepend-include as another Solaris compatible option reused, I thought
it was worth installing this into the branch, to give us more freedom in
2.0 if we decide that --safer should have a short option.

2006-09-14  Eric Blake  <address@hidden>

        * src/m4.c (main): Warn on deprecated options.
        * doc/m4.texinfo (Invoking m4): Document this.
        * NEWS: Likewise.


- --
Life is short - so eat dessert first!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.1 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFFCV8684KuGfSFAYARAuCeAJsEWTV+DF4FJODLZix3mlN0fXGxFQCcC6WS
Vu4DlVmTcEgPkJzZFHYiORg=
=khEA
-----END PGP SIGNATURE-----

Index: NEWS
===================================================================
RCS file: /sources/m4/m4/NEWS,v
retrieving revision 1.1.1.1.2.61
diff -u -p -r1.1.1.1.2.61 NEWS
--- NEWS        11 Sep 2006 13:17:20 -0000      1.1.1.1.2.61
+++ NEWS        14 Sep 2006 13:54:14 -0000
@@ -15,6 +15,9 @@ Version 1.4.7 - ?? ??? 2006, by ??  (CVS
 * When standard input is a seekable file, the m4exit, syscmd, and esyscmd
   macros now restore the current position to the next unread byte rather
   than discarding an arbitrary amount of buffered data.
+* The no-op compatibility command line options -B, -N, -S, -T, and
+  --diversions may be withdrawn or assigned new meanings in m4 2.0, so
+  they now issue a warning.
 
 Version 1.4.6 - 25 August 2006, by Eric Blake  (CVS version 1.4.5a)
 
Index: doc/m4.texinfo
===================================================================
RCS file: /sources/m4/m4/doc/m4.texinfo,v
retrieving revision 1.1.1.1.2.75
diff -u -p -r1.1.1.1.2.75 m4.texinfo
--- doc/m4.texinfo      11 Sep 2006 13:17:20 -0000      1.1.1.1.2.75
+++ doc/m4.texinfo      14 Sep 2006 13:54:15 -0000
@@ -519,7 +519,8 @@ problem in general, if not undecidable!
 @itemx -S @var{NUM}
 @itemx -T @var{NUM}
 These options are present for compatibility with System V @code{m4}, but
-do nothing in this implementation.  They may disappear in future releases.
+do nothing in this implementation.  They may disappear in future
+releases, and issue a warning to that effect.
 
 @item -N @var{NUM}
 @itemx address@hidden
@@ -527,7 +528,7 @@ These options are present only for compa
 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.
+releases, and issue a warning to that effect.
 @end table
 
 @acronym{GNU} @code{m4} comes with a feature of freezing internal state
Index: src/m4.c
===================================================================
RCS file: /sources/m4/m4/src/Attic/m4.c,v
retrieving revision 1.1.1.1.2.28
diff -u -p -r1.1.1.1.2.28 m4.c
--- src/m4.c    7 Sep 2006 22:48:15 -0000       1.1.1.1.2.28
+++ src/m4.c    14 Sep 2006 13:54:15 -0000
@@ -309,6 +309,8 @@ main (int argc, char *const *argv, char 
       case 'N':
       case 'S':
       case 'T':
+       error (0, 0, "Warning: `m4 -%c' may be removed in a future release",
+              optchar);
        break;
 
       case 'D':