CVSROOT: /sources/m4
Module name: m4
Branch: branch-1_4
Changes by: Eric Blake <ericb> 06/09/21 04:13:22
Index: src/m4.c
===================================================================
RCS file: /sources/m4/m4/src/Attic/m4.c,v
retrieving revision 1.1.1.1.2.30
retrieving revision 1.1.1.1.2.31
diff -u -b -r1.1.1.1.2.30 -r1.1.1.1.2.31
--- src/m4.c 20 Sep 2006 03:59:42 -0000 1.1.1.1.2.30
+++ src/m4.c 21 Sep 2006 04:13:22 -0000 1.1.1.1.2.31
@@ -139,7 +139,7 @@
--help display this help and exit\n\
--version output version information and exit\n\
-E, --fatal-warnings stop execution after first warning\n\
- -e, --interactive unbuffer output, ignore interrupts\n\
+ -i, --interactive unbuffer output, ignore interrupts\n\
-P, --prefix-builtins force a `m4_' prefix to all builtins\n\
-Q, --quiet, --silent suppress some warnings for builtins\n\
", stdout);
@@ -235,7 +235,7 @@
{"freeze-state", required_argument, NULL, 'F'},
{"hashsize", required_argument, NULL, 'H'},
{"include", required_argument, NULL, 'I'},
- {"interactive", no_argument, NULL, 'e'},
+ {"interactive", no_argument, NULL, 'i'},
{"nesting-limit", required_argument, NULL, 'L'},
{"prefix-builtins", no_argument, NULL, 'P'},
{"quiet", no_argument, NULL, 'Q'},
@@ -261,9 +261,9 @@
int retcode;
#ifdef ENABLE_CHANGEWORD
-#define OPTSTRING "B:D:EF:GH:I:L:N:PQR:S:T:U:W:d::el:o:st:"
+#define OPTSTRING "B:D:EF:GH:I:L:N:PQR:S:T:U:W:d::eil:o:st:"
#else
-#define OPTSTRING "B:D:EF:GH:I:L:N:PQR:S:T:U:d::el:o:st:"
+#define OPTSTRING "B:D:EF:GH:I:L:N:PQR:S:T:U:d::eil:o:st:"
#endif
int
@@ -391,6 +391,9 @@
break;
case 'e':
+ error (0, 0, "Warning: `m4 -e' is deprecated, use `-i' instead");
+ /* fall through */
+ case 'i':
interactive = TRUE;
break;
