2017-05-21  Jim Meyering  <meyering@fb.com>

	version 3.6

	* NEWS: Record release date.

2017-05-19  Jim Meyering  <meyering@fb.com>

	gnulib: update to latest

2017-05-18  Jim Meyering  <meyering@fb.com>

	maint: update to work with GCC7's -Werror=implicit-fallthrough=

	* src/system.h (FALLTHROUGH): Define.

	Use new FALLTHROUGH macro in place of comments

	* src/cmp.c: FIXME

	* src/diff3.c: FIXME

	* src/ifdef.c: FIXME

	* src/sdiff.c: FIXME

	* src/side.c: FIXME

	* src/util.c: FIXME

	gnulib: update to latest

2017-05-09  Jim Meyering  <meyering@fb.com>

	tests: new-file: closed-stdin: also ensure stdout was empty

	* tests/new-file: Also require that "out" be empty.

2017-05-06  Jim Meyering  <meyering@fb.com>

	maint: stop using @acronym{...} in texinfo sources

	* doc/diffutils.texi: Remove all uses of @acronym{...},

	per recommendation by Karl Berry.

	* cfg.mk (local-checks-to-skip): Remove exemption, enabling

	the @acronym{-prohibiting syntax-check rule.

2017-05-05  Paul Eggert  <eggert@cs.ucla.edu>

	cmp: improve EOF diagnostic

	This improves on yesterday's change, following up on a

	remark by Jim Meyering (Bug#22816#21).

	* doc/diffutils.texi (Invoking cmp, cmp Options): Follow POSIX more

	closely in the documentation of the information appended to the EOF

	diagnostic.

	* src/cmp.c (cmp): Be more specific about the shorter file's length

	and fix some off-by-1 issues in reporting line counts.

	* tests/cmp: Adjust to match new behavior.

	Don't assume internal details about stdio buffering.

2017-05-04  Benno Schulenberg  <bensberg@justemail.net>

	diff: describe each --help option with a single string

	* src/diff.c: To ease translating, fuse four description pieces

	into two whole ones.  Also reword and rewrap one of them to fit

	within eighty characters.

2017-05-04  Paul Eggert  <eggert@cs.ucla.edu>

	cmp: report prefix length when one file is shorter

	Requested by Dan Jacobson (Bug#22816).

	* NEWS:

	* doc/diffutils.texi (Invoking cmp, cmp Options): Document this.

	* src/cmp.c (cmp): Implement it.

	* tests/Makefile.am (TESTS): Add cmp.

	* tests/cmp: New file.

2017-05-02  Jim Meyering  <meyering@fb.com>

	tests: add test for latest fix

	* NEWS (Bug fixes): Describe it.

	* tests/invalid-re: New test for just-fixed bug.

	* tests/Makefile.am (TESTS): Add it.

	gnulib: update to latest

2017-04-27  Paul Eggert  <eggert@cs.ucla.edu>

	diff: don't crash if regexp is invalid

	Problem reported by Marcel Böhme in:

	http://lists.gnu.org/archive/html/bug-diffutils/2017-04/msg00002.html

	* src/diff.c (add_regexp): Exit if re_compile_pattern fails.

2017-03-24  julama  <julama@fake-box.com>

	tests: avoid false failure for unreadable /proc/cmdline

	* tests/brief-vs-stat-zero-kernel-lies: Use "test -r" rather than

	just "test -f".  This avoids a false test failure on a linux system

	with grsecurity and its GRKERNSEC_PROC_USER option enabled, for which

	/proc/cmdline is unreadable.  Reported in https://bugs.gnu.org/26155

2017-02-01  Jim Meyering  <meyering@fb.com>

	tests: avoid false failure with some shells on debian, freebsd

	* tests/colors: Move the TERM=dumb setting into the code run by

	"returns_", since some shells do not propagate envvar setting through

	to a use of a function like this.  That would cause this test to fail

	because results were colorized when they should not have been.

	Reported by Nelson Beebe.

2017-01-31  Jim Meyering  <meyering@fb.com>

	maint: add "introduced in 3.4" in latest NEWS entry

	* NEWS: Update.  Also, thanks to Nelson Beebe for reporting this.

	diff: avoid UMR with ---presume-output-tty

	* src/diff.c (main): Always define presume_output_tty.

	Otherwise, it would be read uninitialized.

	Introduced in v3.3-45-g17e2698

	* NEWS (Bug fixes): Mention it.

	gnulib: update to latest; and update bootstrap and init.sh

	maint: change "time stamp" to "timestamp" globally

	This avoids a new syntax-check failure.

	* ChangeLog-2008: Perform that change.

	* doc/diffutils.texi: Likewise.

	* NEWS: Likewise.

	* cfg.mk: Update the old news hash accordingly.

2017-01-01  Jim Meyering  <meyering@fb.com>

	maint: update gnulib and copyright dates for 2017

	* gnulib: Update to latest.

	* all files: Run "make update-copyright".

2016-11-08  Jim Meyering  <meyering@fb.com>

	tests: use "returns_" rather than explicit comparison with "$?"

	* tests/colors: Use "returns_ 1" rather than testing $? = 1

	* tests/basic: Likewise.

	* tests/binary: Likewise.

	* tests/filename-quoting: Likewise.

	* tests/function-line-vs-leading-space: Likewise.

	* tests/ignore-matching-lines: Likewise.

	* tests/label-vs-func: Likewise.

	* tests/new-file: Likewise.

	* tests/no-dereference: Likewise.

	* tests/no-newline-at-eof: Likewise.

	* tests/stdin: Likewise.

2016-10-25  Paul Eggert  <eggert@cs.ucla.edu>

	diff: fix big performance degradation in 3.4

	* NEWS, doc/diffutils.texi (Overview): Document this.

	* src/analyze.c (diff_2_files): Restore too_expensive heuristic,

	but this time with a floor that is 16 times the old floor.  This

	should fix Bug#16848, by generating good-quality output for its

	test case, while not introducing Bug#24715, by running nearly as

	fast as diff-3.3 for that test case.

	build: update gnulib submodule to latest

2016-10-16  Jim Meyering  <meyering@fb.com>

	maint: use die rather than error

	Use "die (N, ..." rather than "error (N, ..." whenever N is a nonzero

	constant.  That lets the compiler know that control never goes beyond

	that point, and thus makes unnecessary the occasional following

	"abort ();" or "break;" statement we have historically added to inform

	static analysis tools of this aspect of "error" semantics.

	* src/die.h: New file.

	* src/Makefile.am (noinst_HEADERS): Add it.

	* src/cmp.c: Use die in place of error whenever the first

	argument is a nonzero constant.  Also remove any immediately-

	following call to abort, and include "die.h".

	* src/diff.c: Likewise.

	* src/diff3.c: Likewise.

	* src/sdiff.c: Likewise.

	* src/util.c: Likewise.

2016-10-02  Jim Meyering  <meyering@fb.com>

	gnulib: update to latest

	build: avoid GCC 7's new warnings

	* src/util.c (get_funky_string): Adjust comment so that GCC 7's

	-Wimplicit-fallthrough recognizes it.

	* src/diff3.c (main): Cast boolean MERGE to "int" to avoid this:

	diff3.c:341:25: error: '~' on a boolean expression \

	[-Werror=bool-operation]

2016-08-30  Jim Meyering  <meyering@fb.com>

	gnulib: update to latest

2016-08-29  Jim Meyering  <meyering@fb.com>

	gnulib: update to latest, to port to upcoming GCC 7

	This fixes compilation errors when using gcc-7-to-be that were

	due to missing backslashes in gnulib's intprops.h and an API

	change in functions like __builtin_add_overflow.  This ports

	to GCC 7's newer built-in overflow-checking functions.

2016-08-28  Paul Eggert  <eggert@cs.ucla.edu>

	diff: don't assume ptrdiff_t <= long long int

	* src/system.h (printint, pI): Port to (theoretical) platforms

	where ptrdiff_t is wider than long long int (Bug#24311).

2016-08-27  Paul Eggert  <eggert@cs.ucla.edu>

	diff: port line numbers to mingw64

	Problem reported by Peter Rosin (Bug#24311).

	* src/system.h (printint, pI): New typedef and macro.

	All uses of 'long int' and "%l" in printf format replaced by

	'printint' and "%"pI respectively.

	* src/ifdef.c (do_printf_spec): Don't assume pI is length 1.

2016-08-20  Jim Meyering  <meyering@fb.com>

	maint: post-release administrivia

	* NEWS: Add header line for next release.

	* .prev-version: Record previous version.

	* cfg.mk (old_NEWS_hash): Auto-update.

	version 3.5

	* NEWS: Record release date.

2016-08-16  Jim Meyering  <meyering@fb.com>

	build: arrange to build with -fno-common, when possible

	* configure.ac (WERROR_CFLAGS): Add -fno-common, when possible.

	This would have prevented the duplicate definition of

	presume_output_tty that was fixed in v3.4-10-gc2dc91f.

2016-08-16  Hanno Böck  <hanno@hboeck.de>

	diff: avoid duplicate definition of presume_output_tty

	* src/util.c (presume_output_tty): Remove this definition.

	The other is in diff.h.  Reported in https://bugs.gnu.org/24248

2016-08-14  Jim Meyering  <meyering@fb.com>

	gnulib: update to latest

	tests: diff3: work around missing seq on some systems

	* tests/diff3 (seq): Provide a seq replacement function,

	since at least AIX, SunOS 5.10, OpenBSD-5.8 lack it.

	Reported by Assaf Gordon in https://bugs.gnu.org/24227#8

2016-08-13  Jim Meyering  <meyering@fb.com>

	diff3: fix leaks, for real

	* src/diff3.c (struct diff_block)[lint]: Add member, n2.

	(free_diff_block, next_to_n2): New functions.

	* tests/diff3: Add more test coverage.

	maint: require that commit messages be of a certain form

	* bootstrap.conf (bootstrap_epilogue): Merge from coreutils, so that

	a local commit hook will now help enforce consistent commit messages.

	* Makefile.am (check-git-hook-script-sync): New rule, largely copied

	from coreutils.

	* scripts/git-hooks/commit-msg: New file, from coreutils, but

	with adapted list of program names.

	* scripts/git-hooks/applypatch-msg: New file, from git.

	* scripts/git-hooks/pre-applypatch: Likewise.

	* scripts/git-hooks/pre-commit: Likewise.

2016-08-13  Bastian Beischer  <bastian.beischer@rwth-aachen.de>

	diff3: fix heap use-after-free; add minimal diff3 test coverage

	Commit v3.3-42-g3b74a90, "FIXME: src/diff3: plug a leak" added an

	invalid use of free, leading to use-after-free in nearly any invocation

	of diff3.  Revert that commit.

	* NEWS (Bug fixes): Mention it.

	* tests/diff3: New file, to add minimal test coverage.

	* tests/Makefile.am (TESTS): Add it.

	Reported by Bastian Beischer in http://bugs.gnu.org/24210

2016-08-13  Jim Meyering  <meyering@fb.com>

	build: ignore texinfo build artifacts

	* .gitignore: Ignore texinfo artifacts in doc/.

	maint: diff3: remove an unreachable statement

	* src/diff3.c (main): Remove unreachable "return" after exit from main.

2016-08-08  Jim Meyering  <meyering@fb.com>

	diff: disable colorization for TERM=dumb

	* src/diff.c (main): With --color or --color=auto, when TERM is

	"dumb", disable colorization.  Suggested by Daniel Colascione.

	* NEWS (Bug fixes): Mention it.

	* tests/colors: Add a test that would fail without this change,

	yet passes with it.

	maint: post-release administrivia

	* NEWS: Add header line for next release.

	* .prev-version: Record previous version.

	* cfg.mk (old_NEWS_hash): Auto-update.

	version 3.4

	* NEWS: Record release date.

2016-08-06  Jim Meyering  <meyering@fb.com>

	gnulib: update to latest

	tests: tweak built_programs definition

	* tests/Makefile.am (built_programs): Adjust to work around what

	may be a problem due to interaction between Solaris 10's /bin/sh

	and an old version of GNU make. Reported by Dagobert Michelsen

	in https https://bugs.gnu.org/24137.

2016-08-02  Jim Meyering  <meyering@fb.com>

	gnulib: update to latest

	tests: skip a /proc/self-dependent test on the Hurd

	* tests/brief-vs-stat-zero-kernel-lies: The Hurd's /proc/self

	is not useful, so detect that and skip the test that requires it.

	Reported by Assaf Gordon in https://debbugs.gnu.org/24121#29

2016-08-01  Jim Meyering  <meyering@fb.com>

	tests/colors: fix portability problem with touch --date

	* tests/colors (epoch): Don't use GNU touch's --date=$epoch option.

	Use the portable -t 197001010000.00.

	Reported by Assaf Gordon in https://debbugs.gnu.org/24121#8

	build: Solaris 9: avoid link failure due to isblank use

	* bootstrap.conf (gnulib_modules): Add isblank, to avoid a link

	error on Solaris 9 Sparc.  Reported by Dagobert Michelsen.

	test: improve test infrastructure

	* tests/envvar-check: New file, copied from grep, with the addition

	of the EDITOR and GREP_OPTIONS envvar names.

	* tests/Makefile.am (EXTRA_DIST): Add it.

	(TESTS_ENVIRONMENT): Revamp, to be more like that of grep.

2016-07-31  Jim Meyering  <meyering@fb.com>

	maint: remove gl/lib/reg*.c.diff; no longer needed

	* gl/lib/regcomp.c.diff: Remove file, now that gnulib's

	regcomp.c compiles regex.c with -Wno-unused-parameter.

	* gl/lib/regex_internal.c.diff: This file induced a change to ensure

	that the "Idx" type was unsigned and to remove a few "VAR < 0"

	comparisons.  These days, it is probably fine to stay in sync with

	gnulib/glibc's copies

	of these files, so remove these patches, too.

	* gl/lib/regexec.c.diff: Likewise.

	Prompted by a report by Assaf Gordon and a suggestion from Paul Eggert.

	tests: colors: fix a portability problem and work around a shell bug

	* tests/colors (e): Fix a portability bug: use printf '\033'

	rather than '\e' to generate the required byte sequence, since

	for some shells (at least dash 0.5.8), the latter doesn't work.

	Work around a shell bug whereby "local tab=$(printf '\t')"

	would result in an empty value for "$tab": hoist each "tab"

	definition up/out of its function to global scope.

	Reported by Assaf Gordon in http://debbugs.gnu.org/24116#8

2016-07-23  Jim Meyering  <meyering@fb.com>

	gnulib: update to latest; and tests/init.sh

	* gnulib: Update to latest.

	* init.sh: Update from gnulib.

2016-05-30  Jim Meyering  <meyering@fb.com>

	maint: arrange for "make distcheck" to work with unreleased automake

	* dist-check.mk (my-distcheck): Remove all .deps directories

	before performing the recursive comparison.

2016-05-24  Glenn Morris  <rgm@gnu.org>

	doc: fix a reference to emacs' emerge node

	* doc/diffutils.texi (Interactive Merging): Correct a reference to

	emacs' emerge node: s/emerge/Emerge/.

	This addresses http://debbugs.gnu.org/23613

2016-04-30  Jim Meyering  <meyering@fb.com>

	maint: arrange for better URLs in generated announcement message

	* cfg.mk (url_dir_list): Define.  I had been correcting the generated

	URLs by hand, just before the announcement.  This is better.

2016-03-15  Jim Meyering  <meyering@fb.com>

	maint: don't ignore gitlog-to-changelog failure

	* Makefile.am (gen-ChangeLog): Don't ignore failure of

	gitlog-to-changelog. This syncs to coreutils' copy of this rule.

2016-03-06  Giuseppe Scrivano  <gscrivano@gnu.org>

	diff: --color: fix an infinite recursion bug

	* src/diff.h (presume_output_tty): New extern variable.

	* src/diff.c (PRESUME_OUTPUT_TTY_OPTION): New enum.

	(group_format_option): Add '-presume-output-tty'.

	(main): Handle PRESUME_OUTPUT_TTY_OPTION.

	* src/util.c: New variable `presume_output_tty'.

	(check_color_output): Handle presume_output_tty.

	(set_color_context): Call process_signals only when color_context is

	not RESET_CONTEXT.

	* tests/colors: Check that diff doesn't crash when interrupted

	in the middle of a color sequence.

	Reported by Gisle Vanem in http://debbugs.gnu.org/22067

2016-01-31  Jim Meyering  <meyering@fb.com>

	maint: update prereq version of gettext

	* configure.ac: Increase designated gettext version to 0.19.2

	* bootstrap.conf (buildreq): Likewise.

	Remove now-unnecessary code to remove gettext-provided files.

	gnulib: update to latest

2016-01-01  Jim Meyering  <meyering@fb.com>

	FIXME: src/diff3: plug a leak

2016-01-01  Jim Meyering  <meyering@fb.com>

	maint: update copyright year, bootstrap, init.sh

	Run "make update-copyright" and then...

	* gnulib: Update to latest.

	* tests/init.sh: Update from gnulib.

	* bootstrap: Likewise.

2015-12-06  Jim Meyering  <meyering@fb.com>

	diff --brief no longer mistakenly reports diff. with 0-sized /proc/ files

	Normally, it is safe to assume two regular files are different when

	their st_size values are different.  However, that assumption may

	be invalid if either value is zero, as happens with files on Linux

	/proc and /sys file systems. Since skipping this optimization will

	usually cost very little (one read syscall, to read zero bytes),

	it is fine to accommodate those unusual files.

	* src/analyze.c (diff_2_files): Do not assume regular files differ

	just because their st_size values differ when one or more is 0.

	* src/diff.c (compare_files): Likewise.

	* tests/brief-vs-proc-stat-zero: New test.

	* tests/Makefile.am: Add it.

	* NEWS (Bug fixes): Describe it.

	Reported by Stephan Müller in http://debbugs.gnu.org/21942

	tests: arrange to print any skipped-test explanation to tty, too

	I noticed that when a test was skipped, the reason was not printed.

	This fixes it.  In coreutils, this variable is set in init.cfg,

	but there is no point in putting the definition so far from the

	code that chooses the file descriptor number in tests/Makefile.am.

	* tests/Makefile.am (TESTS_ENVIRONMENT) [stderr_fileno_]: Define

	here (to 9), right next to the companion "9>&2".

2015-11-29  Jim Meyering  <meyering@fb.com>

	build: add gperf to the list of required programs

	* bootstrap.conf (buildreq): Add gperf to the list.

	Reported by Stephan Müller in http://debbugs.gnu.org/21945

2015-11-29  Giuseppe Scrivano  <gscrivano@gnu.org>

	tests: Add tests for --color and --palette

	* tests/colors: New file.

	* tests/Makefile.am (TESTS): Add colors.

	doc: mention --color and --palette in NEWS

	diff: add --palette

	* bootstrap (gnulib_modules): Add 'argmatch'.

	* doc/diffutils.texi: Add documentation for --palette

	* src/diff.h (set_color_palette): New prototype.

	* src/diff.c (set_color_palette): New function.

	(color_palette): New variable.

	* src/utils.c: Include "argmatch.h".

	(struct bin_str): New struct.

	(struct color_ext_type): New struct.

	(color_indicator): New array.

	(indicator_name): New array.

	(indicator_no): New enum.

	(parse_state): New enum.

	(put_indicator): New function.

	(get_funky_string): New function. Copied from coreutils ls.

	(parse_diff_color):  New function. Copied from coreutils ls

	"parse_ls_color" function.

	(set_color_context): Use put_indicator instead of directly

	outputting the sequence.

	* po/POTFILES.in: Add 'lib/argmatch.c'

	diff: add support for --color

	* doc/diffutils.texi (diff Options): Add documentation for --color.

	Copied from coreutils ls --color.

	* src/context.c (pr_unidiff_hunk): Set the color context.

	(print_context_header): Likewise.

	(pr_context_hunk): Likewise.

	* src/diff.h (enum colors_style): New enum to record when to use colors.

	(colors_style): New variable to memorize the argument value.

	(set_color_context): Add function definition.

	* src/diff.c: : Define COLOR_OPTION.

	(specify_colors_style): New function.

	(longopts): Add --color.

	(main): Handle --color argument.

	(option_help_msgid): Add usage string for --color.

	* src/normal.c (print_normal_hunk): Set the color context.

	* src/side.c (print_1sdiff_line): Likewise.

	* src/util.c (print_1_line_nl): New function.

	(print_1_line): Make it a wrapper of 'print_1_line_nl'.

	(colors_enabled): New boolean variable.

	(begin_output): Call check_color_output once the output file is

	configured.

	(output_1_line): Periodically call `process_signals'.

	(caught_signals): New sigset_t.

	(colors_enabled): New boolean variable.

	(interrupt_signal): New sig_atomic_t.

	(stop_signal_count): New sig_atomic_t.

	(check_color_output): New function.

	(install_signal_handlers): Likewise. Copied from coreutils ls.

	(process_signals): Likewise.  Copied from coreutils ls.

	(set_color_context): New function.

	(sighandler): Likewise.  Copied from coreutils ls.

	(stophandler): Likewise.  Copied from coreutils ls.

2015-09-24  Andreas Grünbacher  <agruen@gnu.org>

	diff: Improve help text of option --label

	* src/diff.c (option_help_msgid): Improve help text of option --label.

2015-09-01  Jim Meyering  <meyering@fb.com>

	build: correct man-page generation rule

	The PATH was set incorrectly, so that the diff used by

	help2man was the one from $PATH, rather than the just-built

	one.

	* man/Makefile.am (bin_dir): New variable, to...

	(dist_man1_MANS): ...prepend ../src to PATH, not just "..".

	Also, add a test to ensure that each $(bin_dir)/$$base is

	executable, so this doesn't happen again.

	In http://debbugs.gnu.org/21023, Rodrigo Valiña

	Gutiérrez reported that diff.1 from the diffutils-3.3 tarball

	contained no description of the then-new --no-dereference option.

2015-07-10  Jim Meyering  <meyering@fb.com>

	doc: --no-dereference: improve wording/description

	* doc/diffutils.texi (Comparing Directories): Correct grammar.

	(diff Options) [--no-dereference]: Say a little more.

2015-01-01  Jim Meyering  <meyering@fb.com>

	maint: update copyright year ranges to include 2015; update gnulib

2014-12-12  KO Myung-Hun  <komh@chollian.net>

	diff: skip test if seek is not possible on OS/2 kLIBC

	This fixes the problem that 'diff - file' and 'cat file | diff - file'

	fail due to a seek failure with a message 'diff.exe: -: Invalid seek',

	because seek does not work on stdin and a pipe on OS/2 kLIBC.

	* src/io.c (sip): Set skip_test to true if seek is not possible on

	OS/2 kLIBC.

2014-12-09  Jim Meyering  <meyering@fb.com>

	gnulib: update to latest

2014-12-09  KO Myung-Hun  <komh78@gmail.com>

	build: double-quote use of $PATH

	* man/Makefile.am (dist_man1_MANS): On OS/2, PATH_SEPARATOR is ';',

	but unquoted, that is interpreted as the shell's statement

	terminator.  Quote it.

2014-10-27  Paul Eggert  <eggert@cs.ucla.edu>

	diff: fix integer overflow problem with --tabsize

	Reported by Tobias Stoeckmann in: http://bugs.gnu.org/18857

	* src/diff.c (main): Don't overflow if INTMAX_MAX / 2 < tabsize.

	* tests/bignum: New file, to test for this bug.

	* tests/Makefile.am (TESTS): Add it.

2014-09-03  Paul Eggert  <eggert@cs.ucla.edu>

	doc: mention diff -B fix in NEWS

	diff: fix bug with diff -B and incomplete lines

	Reported by Navin Kabra via Eric Blake in:

	http://bugs.gnu.org/18402

	* src/util.c (analyze_hunk): Don't mishandle incomplete

	lines at end of file.

	* tests/no-newline-at-eof: Test for the bug.

	diff: fix performance bug with prefix computation

	* src/io.c (find_identical_ends): Fix performance bug:

	the test for when the prefix was needed messed up by

	the 2002-02-28 integer-overflow fixes, causing performance to be

	worse than it needed to be.

2014-08-23  Jim Meyering  <meyering@fb.com>

	gnulib: update to latest, as well as bootstrap

	maint: update copyright year range in texinfo documentation

	* doc/diffutils.texi: Update copyright.

2014-04-15  Jim Meyering  <meyering@fb.com>

	maint: update bug-reporting address

	* README: Change bug-gnu-utils@... to bug-diffutils@gnu.org.

	* doc/diffutils.texi: Likewise.

	Reported by Jamie Landeg Jones.

2014-03-26  Paul Eggert  <eggert@penguin.cs.ucla.edu>

	diff: fix two "..." typos in --help output

	* src/diff.c (option_help_msgid): Remove two "..." typos (Bug#17102).

2014-03-25  Paul Eggert  <eggert@cs.ucla.edu>

	doc: improve documentation about reading and stdin

	See Bug#17075.

	* doc/diffutils.texi (Comparison): Say that files need not be read.

	(Invoking diff): Remove confusing remark about 'diff - -'.

	It's not that useful, and it's not portable anyway.

2014-02-24  Paul Eggert  <eggert@cs.ucla.edu>

	diff, sdiff: minor integer overflow fixes

	* src/context.c (find_hunk):

	Simplify, now that 2 * context + 1 cannot overflow.

	* src/diff.c (main):

	* src/sdiff.c (interact):

	Don't rely on undefined behavior on signed integer overflow.

	* src/diff.c (main): Don't let contexts exceed CONTEXT_MAX.

	* src/system.h (CONTEXT_MAX): New macro.

	diff: fix bug with -I and overlapping hunks

	Problem reported by Vincent Lefevre in <http://bugs.gnu.org/16864>.

	* src/context.c (find_hunk): Threshold is CONTEXT only if

	the second change is ignorable.

	* tests/ignore-matching-lines: New test.

	* tests/Makefile.am (TESTS): Add it.

2014-02-23  Paul Eggert  <eggert@cs.ucla.edu>

	diff: remove TOO_EXPENSIVE heuristic

	Problem reported by Vincent Lefevre in <http://bugs.gnu.org/16848>.

	The simplest solution is to remove the TOO_EXPENSIVE heuristic

	that I added to GNU diff in 1993.  Although appropriate for

	circa-1993 hardware, these days the heuristic seems to be more

	trouble than it's worth.

	* NEWS: Document this.

	* doc/diffutils.texi (Overview): Modernize citations.

	Remove mention of TOO_EXPENSIVE heuristic.

	* src/analyze.c (diff_2_files): Adjust to TOO_EXPENSIVE-related

	API changes in gnulib's diffseq module.

	build: update gnulib submodule to latest

2014-01-31  Paul Eggert  <eggert@cs.ucla.edu>

	diff: exit with status 1, not 2, when binary files differ

	Problem reported by Vincent Lefevre in <http://bugs.gnu.org/16608>.

	* NEWS:

	* doc/diffutils.texi (Binary, Invoking diff): Document this.

	* src/analyze.c (briefly_report): Return void, not int.

	All uses changed.  Do not futz with exit status.  Simplify.

	* tests/binary: Adjust to match new behavior.

2013-09-26  Paul Eggert  <eggert@cs.ucla.edu>

	build: omit -Wsuggest-attribute=pure for lib

	* configure.ac (WARN_CFLAGS): Omit -Wsuggest-attribute=pure

	when compiling the lib subdirectory.  Reported for Fedora 19

	by Eric Blake in <http://bugs.gnu.org/15463>.

2013-08-22  Paul Eggert  <eggert@cs.ucla.edu>

	cmp, diff, sdiff: tune by using rawmemchr

	On my platform (AMD Phenom II X4 910e, Fedora 17 x86-64), this sped up

	'cmp -n 8GiB /dev/full /dev/zero' by a factor of 3.8, and

	'cmp -sn 8GiB /dev/full /dev/zero' by a factor of 1.8.

	* bootstrap.conf (gnulib_modules): Add rawmemchr.

	* src/cmp.c (cmp): Optimize the common case where buffers are the same,

	by using count_newlines rather than block_compare_and_count.

	(block_compare_and_count): Remove.

	(count_newlines): New function.

	* src/cmp.c (count_newlines):

	* src/io.c (prepare_text):

	* src/sdiff.c (lf_copy, lf_skip, lf_snarf):

	Use rawmemchr instead of memchr, for speed.

2013-08-12  Paul Eggert  <eggert@cs.ucla.edu>

	cmp: tune 'cmp a b' for GCC x86

	Performance problem reported by David Balažic in:

	http://lists.gnu.org/archive/html/bug-diffutils/2013-08/msg00013.html

	* src/system.h (word): Make it size_t, not uintmax_t.

	This sped up plain cmp 90% on my tests (GCC 4.8.1, x86).

2013-07-06  Paul Eggert  <eggert@cs.ucla.edu>

	build: update gnulib submodule to latest

2013-05-06  Stefano Lattarini  <stefano.lattarini@gmail.com>

	build: enable 'subdir-objects' automake option

	The future major Automake version (2.0, ETA at least one year from now)

	might enable that option unconditionally, so better get prepared in due

	time.

	* configure.ac (AM_INIT_AUTOMAKE): Adjust.

	(AM_PROG_CC_C_O): New, required by Automake up to 1.13.x when the

	'subdir-objects' is in use.

2013-04-28  Paul Eggert  <eggert@cs.ucla.edu>

	build: update gnulib submodule to latest

2013-04-03  Paul Eggert  <eggert@cs.ucla.edu>

	diff: fix bug with Asian file names

	Problem reported by Errembault Philippe in:

	http://lists.gnu.org/archive/html/bug-diffutils/2013-03/msg00012.html

	* NEWS: Document this.

	* src/dir.c (compare_names): Fall back on file_name_cmp if

	compare_collated returns 0, unless ignoring file name case.

	(diff_dirs): Don't bother with the O(N**2) stuff unless ignoring

	file name case.

	* tests/Makefile.am (TESTS): Add strcoll-0-names.

	* tests/strcoll-0-names: New file.

	diff: remove unnecessary decl

	* src/dir.c (compare_names_for_qsort): Remove declaration.

	Not needed now that we assume C89.

	diff: tune compare_names_for_qsort

	* src/dir.c (compare_collated): New function.

	(compare_names): Use it.

	(compare_names_for_qsort): Use it.  This is a bit more efficient

	as it can avoid a double invocation of file_name_cmp when

	file_name_cmp returns zero.

2013-03-30  Jim Meyering  <meyering@fb.com>

	doc: mention new option, --no-dereference in 3.3's NEWS

	* NEWS (New feeatures): Update 3.3's news to mention --no-dereference.

	Reported by Denis Excoffier.

	* Makefile.am (old_NEWS_hash): Update, since this modifies old, and

	normally-immutable NEWS.

2013-03-26  Paul Eggert  <eggert@cs.ucla.edu>

	tests: port to Solaris 10 /bin/sh

	* tests/Makefile.am (TESTS_ENVIRONMENT):

	Use "FOO=val; export FOO" rather than "export FOO=val",

	as the latter form doesn't work with Solaris /bin/sh.

	Problem found when trying to run "make check" on Solaris 10.

2013-03-24  Jim Meyering  <meyering@fb.com>

	maint: post-release administrivia

	* NEWS: Add header line for next release.

	* .prev-version: Record previous version.

	* cfg.mk (old_NEWS_hash): Auto-update.

	version 3.3

	* NEWS: Record release date.

2013-03-23  Paul Eggert  <eggert@cs.ucla.edu>

	doc: fix menu typo

	* doc/diffutils.texi (Comparing Three Files): Fix out-of-order menu.

	Bug caught by Texinfo 5.0.

	maint: update build procedure to recent gettext etc.

	* bootstrap.conf (gnulib_modules): Add vararrays.

	(needed_gnulib_files, unnecessary_gettext_files): New vars.

	(bootstrap_post_import_hook): New function, to implement these vars.

	(excluded_files): Remove; 'bootstrap' no longer supports this.

	Its function is now performed by unnecessary_gettext_files.

	(buildreq): Update automake to 1.12.2, to avoid CVE-2012-3386.

	* configure.ac (AM_GNU_GETTEXT_VERSION): Bump from 0.17 to 0.18.2,

	to lessen the probability that we'll have outlandishly old files

	during a build.

	* m4/vararrays.m4: Remove from repository, as we now use the

	gnulib version.

2013-03-21  Jim Meyering  <jim@meyering.net>

	build: update gnulib to latest and adapt; update bootstrap, too

	Blindly updating to the latest from gnulib, bootstrap would

	fail due to failure of our local patches to apply.  Hence,

	these first two updates.

	* gl/lib/regex_internal.c.diff: Update offsets, so this patch

	applies to the latest from gnulib.

	* gl/lib/regex_internal.h.diff: Remove file.  No longer needed.

	* bootstrap: Update from gnulib.

2013-01-06  Paul Eggert  <eggert@cs.ucla.edu>

	tests: port to hosts lacking fmt, make -C

	* tests/Makefile.am (built_programs): Don't assume fmt works.

	Don't rely on 'make -C', either.

	maint: update .gitignore for recent gnulib

	* .gitignore: Add tests/*.trs and several *.h and *.sed files in lib,

2013-01-04  Jim Meyering  <jim@meyering.net>

	build: update gnulib submodule to latest

	maint: update all copyright year number ranges

	Run "make update-copyright".

2012-10-23  Eric Blake  <eblake@redhat.com>

	build: default to --enable-gcc-warnings in a git tree

	Anyone building from cloned sources can be assumed to have a new

	enough environment, such that enabling gcc warnings by default will

	be useful.  Tarballs still default to no warnings, and the default

	can still be overridden with --disable-gcc-warnings.

	* configure.ac (gl_gcc_warnings): Set default based on environment.

2012-10-03  Paul Eggert  <eggert@cs.ucla.edu>

	* doc/diffutils.texi (cmp Options): Document -l format better.

2012-09-10  Jim Meyering  <meyering@redhat.com>

	maint: use xasprintf in place of xmalloc+sprintf

	* bootstrap.conf (gnulib_modules): Add gnulib's xvasprintf module.

	* src/util.c: Include "xvasprintf.h".

	(begin_output): Use xasprintf in place of xmalloc+sprintf.

2012-09-10  Andreas Gruenbacher  <agruen@gnu.org>

	diff: encode file names with special characters

	* src/util.c (c_escape_char): New function.

	(c_escape): New function.

	(begin_output): Escape file names when needed.

	* src/context.c (print_context_header): New names parameter.

	(print_context_label): New name parameter.

	* src/diff.h (print_context_header): Change prototype.

	* tests/filename-quoting: New file.

	* NEWS: Document this change.

2012-08-30  Paul Eggert  <eggert@cs.ucla.edu>

	diff: silence GCC warning instead of slowing down

	* src/dir.c (find_dir_file_pathname): Use 'IF_LINT (volatile)' to

	silence the gcc warning, rather than using 'volatile', as the

	warning appears to be bogus.

2012-08-28  Jim Meyering  <meyering@redhat.com>

	diff: avoid possible longjmp-triggered misbehavior

	* src/dir.c (find_dir_file_pathname): gcc 4.8.0 20120825 reported

	that a local variable's value might be clobbered.  Declare "match"

	to be volatile.

	build: update gnulib, bootstrap and init.sh to latest

	maint: avoid new syntax-check failure due to @xref use

	* doc/diffutils.texi: Change several "; @xref{..." to ".  @xref{...",

	since @xref should start a sentence.

2012-05-15  Paul Eggert  <eggert@cs.ucla.edu>

	maint: remove ms subdirectory

	diffutils is now designed to build with Cygwin or MinGW.

	The old DJGPP stuff probably doesn't work anyway.

	* Makefile.am (SUBDIRS): Remove ms.

	* NEWS: Document this.

	* configure.ac (AC_CONFIG_FILES): Remove ms/Makefile.

	* ms/Makefile.am, ms/README, ms/config.bat, ms/config.sed:

	* ms/config.site: Remove.

2012-05-14  Paul Eggert  <eggert@cs.ucla.edu>

	maint: update bootstrap from gnulib

	* bootstrap: Update from gnulib.

	main: port subcommands to mingw

	Problem reported by Eli Zaretskii in

	<http://lists.gnu.org/archive/html/bug-gnu-utils/2012-05/msg00013.html>.

	Approach suggested by Bruno Haible as option (4) in

	<http://lists.gnu.org/archive/html/bug-gnu-utils/2012-05/msg00036.html>.

	* bootstrap.conf (gnulib_modules): Add system-quote.