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=c6142860f91580baeeb594d56dbcebd5c8a25578 The branch, master has been updated via c6142860f91580baeeb594d56dbcebd5c8a25578 (commit) via 39e9b179978e9de63c42f847ac55da88c4ca29c2 (commit) from 2231a48eb7d4a068eae671542ae256f850a60c01 (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 c6142860f91580baeeb594d56dbcebd5c8a25578 Author: Eric Blake <[EMAIL PROTECTED]> Date: Mon Aug 18 16:29:30 2008 -0600 Remove deprecated -N option; fixes a regression from 2006-09-14. * src/main.c (DIVERSIONS_OPTION): Delete. (long_options, OPTSTRING, main): Remove -N/--diversions option. * doc/m4.texinfo (Limits control): Remove it from the manual. * NEWS: Mention that it is gone. * tests/options.at (deprecated options): Update test. Signed-off-by: Eric Blake <[EMAIL PROTECTED]> (cherry picked from commit b8829779ba82826040f16fe78420f0e5a2fe881e) commit 39e9b179978e9de63c42f847ac55da88c4ca29c2 Author: Eric Blake <[EMAIL PROTECTED]> Date: Mon Aug 18 14:31:36 2008 -0600 Improve 'git diff' of manual source. * .gitattributes (*.texi*): Add diff attribute. * bootstrap: Tell git how to use it. Inspired by Jim Meyering's similar patch for coreutils. Signed-off-by: Eric Blake <[EMAIL PROTECTED]> (cherry picked from commit 4e263cf79a9785c62831de04cb951b47698daae5) ----------------------------------------------------------------------- Summary of changes: .gitattributes | 5 ++++- ChangeLog | 14 ++++++++++++++ NEWS | 3 +++ bootstrap | 8 +++++++- doc/m4.texinfo | 10 ++++------ src/main.c | 12 +----------- tests/options.at | 9 +++++---- 7 files changed, 38 insertions(+), 23 deletions(-) diff --git a/.gitattributes b/.gitattributes index a7c8702..233cfcd 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,6 @@ +# See ./bootstrap for some helpful ~/.gitconfig or .git/config settings +# needed for using these attributes effectively. +ChangeLog merge=merge-changelog +*.texi* diff=texinfo null.* diff merge iso8859.m4 diff merge -ChangeLog merge=merge-changelog diff --git a/ChangeLog b/ChangeLog index d002918..e6b465d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2008-08-18 Eric Blake <[EMAIL PROTECTED]> + + Remove deprecated -N option; fixes a regression from 2006-09-14. + * src/main.c (DIVERSIONS_OPTION): Delete. + (long_options, OPTSTRING, main): Remove -N/--diversions option. + * doc/m4.texinfo (Limits control): Remove it from the manual. + * NEWS: Mention that it is gone. + * tests/options.at (deprecated options): Update test. + + Improve 'git diff' of manual source. + * .gitattributes (*.texi*): Add diff attribute. + * bootstrap: Tell git how to use it. + Inspired by Jim Meyering's similar patch for coreutils. + 2008-08-07 Bruno Haible <[EMAIL PROTECTED]> (tiny change) Run m4 tests prior to gnulib unit tests. diff --git a/NEWS b/NEWS index 562bc7c..e8b08d0 100644 --- a/NEWS +++ b/NEWS @@ -230,6 +230,9 @@ promoted to 2.0. *** Comments that contain unbalanced quotes were not rescanned correctly when passed through [EMAIL PROTECTED] +** 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/bootstrap b/bootstrap index 591cd37..bea1a46 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh -# bootstrap (GNU M4) version 2008-07-11 +# bootstrap (GNU M4) version 2008-08-18 # Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> # This is free software: you are free to change and redistribute it. @@ -367,6 +367,12 @@ if test -d .git && (git --version) >/dev/null 2>/dev/null ; then else func_echo "consider installing git-merge-changelog from gnulib" fi + if git config diff.texinfo.funcname >/dev/null ; then + : + else + func_echo "initializing git texinfo diff driver" + git config diff.texinfo.funcname '[EMAIL PROTECTED] ][ ]*\\([^,][^,]*\\)' + fi fi ## ---------- ## diff --git a/doc/m4.texinfo b/doc/m4.texinfo index 862dac3..7afd1b6 100644 --- a/doc/m4.texinfo +++ b/doc/m4.texinfo @@ -893,15 +893,13 @@ problem in general, if not undecidable! @item -H @var{NUM} @itemx [EMAIL PROTECTED] [EMAIL PROTECTED] -N @var{NUM} [EMAIL PROTECTED] [EMAIL PROTECTED] @itemx [EMAIL PROTECTED] These options are present only for compatibility with previous versions of GNU @code{m4}. They do nothing except issue a warning, because the -symbol table size and number of diversions are not fixed anymore, and -because the new @code{changesyntax} feature is more efficient than the -withdrawn experimental @code{changeword}. These options will eventually -disappear in future releases. +symbol table size is not fixed anymore, and because the new [EMAIL PROTECTED] feature is more efficient than the withdrawn +experimental @code{changeword}. These options will eventually disappear +in future releases. @item -S @var{NUM} @itemx -T @var{NUM} diff --git a/src/main.c b/src/main.c index 7346d09..c5997b1 100644 --- a/src/main.c +++ b/src/main.c @@ -205,7 +205,6 @@ enum { ARGLENGTH_OPTION = CHAR_MAX + 1, /* not quite -l, because of message */ DEBUGFILE_OPTION, /* no short opt */ - DIVERSIONS_OPTION, /* not quite -N, because of message */ ERROR_OUTPUT_OPTION, /* not quite -o, because of message */ HASHSIZE_OPTION, /* not quite -H, because of message */ IMPORT_ENVIRONMENT_OPTION, /* no short opt */ @@ -254,7 +253,6 @@ static const struct option long_options[] = {"arglength", required_argument, NULL, ARGLENGTH_OPTION}, {"debugfile", required_argument, NULL, DEBUGFILE_OPTION}, - {"diversions", required_argument, NULL, DIVERSIONS_OPTION}, {"hashsize", required_argument, NULL, HASHSIZE_OPTION}, {"error-output", required_argument, NULL, ERROR_OUTPUT_OPTION}, {"import-environment", no_argument, NULL, IMPORT_ENVIRONMENT_OPTION}, @@ -277,7 +275,7 @@ static const struct option long_options[] = behavior also handles -s between files. Starting OPTSTRING with '-' forces getopt_long to hand back file names as arguments to opt '\1', rather than reordering the command line. */ -#define OPTSTRING "-B:D:EF:GH:I:L:M:N:PQR:S:T:U:Wbcd::egil:m:o:p:r::st:" +#define OPTSTRING "-B:D:EF:GH:I:L:M:PQR:S:T:U:Wbcd::egil:m:o:p:r::st:" /* For determining whether to be interactive. */ enum interactive_choice @@ -395,14 +393,6 @@ main (int argc, char *const *argv, char *const *envp) optchar == 'H' ? "-H" : "--hashsize"); break; - case 'N': - case DIVERSIONS_OPTION: - /* -N became an obsolete no-op in 1.4.x. FIXME - remove - support for -N after 2.0. */ - error (0, 0, _("Warning: `%s' is deprecated"), - optchar == 'N' ? "-N" : "--diversions"); - break; - case 'S': case 'T': /* Compatibility junk: options that other implementations diff --git a/tests/options.at b/tests/options.at index 66c4ead..e220c0a 100644 --- a/tests/options.at +++ b/tests/options.at @@ -25,10 +25,11 @@ AT_BANNER([Options.]) AT_SETUP([deprecated options]) -dnl -N/--diversions are no-ops since 1.4.x -AT_CHECK_M4([-N1 --diversions=1], [0], [], -[[m4: Warning: `-N' is deprecated -m4: Warning: `--diversions' is deprecated +dnl -N/--diversions was removed after 1.4.x +AT_CHECK_M4([--diversions=1], [1], [], [stderr]) +AT_CHECK([sed 's/Try.*help/Try `m4 --help/' stderr], [0], +[[m4: unrecognized option `--diversions=1' +Try `m4 --help' for more information. ]]) dnl -H/--hashsize are no-ops since 2.0 hooks/post-receive -- GNU M4 source repository
