2008-01-30  Paul Eggert  <eggert@cs.ucla.edu>

	* doc/diff.texi: Update Back-Cover text to reflect new GNU wording.

2008-01-24  Paul Eggert  <eggert@cs.ucla.edu>

	* src/side.c [!HAVE_MBRTOWC]: Supply defns for mbstate_t and mbrtowc.

	Problem reported by Bruno Haible.

2008-01-23  Paul Eggert  <eggert@cs.ucla.edu>

	* src/side.c (print_half_line): Don't convert to unsigned char

	unnecessarily.

	Don't mishandle multibyte characters in side-by-side format.

	Problem reported by Erik Karlsson in

	<http://lists.gnu.org/archive/html/bug-gnu-utils/2008-01/msg00030.html>.

	* bootstrap.conf (gnulib_modules): Add wcwidth.

	* src/side.c: Include <wchar.h>.

	(print_half_line): Compute number of bytes and print widths of

	multibyte characters.  Inspired by an alternative solution from

	Bruno Haible in

	<http://lists.gnu.org/archive/html/bug-gnu-utils/2008-01/msg00032.html>.

2007-12-04  Paul Eggert  <eggert@cs.ucla.edu>

	* NEWS: New diff option --suppress-blank-empty (no longer -u default).

	* doc/diff.texi (Detailed Unified): Trailing spaces are no longer

	omitted.

	(Trailing Blanks): New section.

	(diff Options) Mention new option.

	* src/diff.h (suppress_blank_entry): New decl.

	* src/context.c (pr_unidiff_hunk): Support --suppress-blank-empty.

	* src/util.c (print_1_line): Likewise.

	* src/diff.c (longopts, main, option_help_msgid): Likewise.

	(SUPPRESS_BLANK_EMPTY_OPTION): New constant.

	* configure.ac: Invoke gl_USE_SYSTEM_EXTENSIONS after gl_EARLY,

	since gnulib now requires this order.

	* bootstrap: Import from gnulib.

2007-08-17  Paul Eggert  <eggert@cs.ucla.edu>

	Break out diffseq.h into a separate file, so that gettext can use

	this code.  Idea and code from Bruno Haible.

	* bootstrap.conf (gnulib_modules): Add diffseq.

	* src/analyze.c (xvec, yvec, fdiag, bdiag, too_expensive, SNAKE_LIMIT):

	(struct partition, diag, compareseq): Remove; now in diffseq.h.

	(ELEMENT, EQUAL, OFFSET, EXTRA_CONTEXT_FIELDS, NOTE_DELETE, NOTE_INSERT):

	(USE_HEURISTIC): New macros.

	Include "diffseq.h".

	(diff_2_files): Rewrite to use new diffseq.h interface.

	* bootstrap: Import from gnulib.

2007-08-15  Paul Eggert  <eggert@cs.ucla.edu>

	* src/diff.c (compare_files): Use last_component rather than base_name,

	adjusting to gnulib API change.  This avoids a memory leak.

	* src/sdiff.c (expand_name): Likewise.

	* src/util.c (dir_file_pathname): Likewise.

	* doc/diff.texi (Copying This Manual): Adjust to new fdl.texi layout.

2007-07-19  Paul Eggert  <eggert@cs.ucla.edu>

	* doc/diff.texi (White Space): Note that newline always ends a line,

	so -w doesn't ignore newline-related changes.  Problem reported by

	David Kastrup.

	* COPYING: New file.

	* AUTHORS: Update from GPLv2 to GPLv3.

	* Makefile.am: Likewise.

	* NEWS: Likewise.

	* README: Likewise.

	* README-hacking: Likewise.

	* bootstrap: Likewise.

	* bootstrap.conf: Likewise.

	* configure.ac: Likewise.

	* exgettext: Likewise.

	* doc/Makefile.am: Likewise.

	* lib/Makefile.am: Likewise.

	* lib/cmpbuf.c: Likewise.

	* lib/cmpbuf.h: Likewise.

	* lib/prepargs.c: Likewise.

	* m4/vararrays.m4: Likewise.

	* man/Makefile.am: Likewise.

	* ms/Makefile.am: Likewise.

	* ms/README: Likewise.

	* ms/config.bat: Likewise.

	* ms/config.sed: Likewise.

	* ms/config.site: Likewise.

	* po/POTFILES.in: Likewise.

	* src/Makefile.am: Likewise.

	* src/analyze.c: Likewise.

	* src/cmp.c: Likewise.

	* src/context.c: Likewise.

	* src/diff.c: Likewise.

	* src/diff.h: Likewise.

	* src/diff3.c: Likewise.

	* src/dir.c: Likewise.

	* src/ed.c: Likewise.

	* src/io.c: Likewise.

	* src/normal.c: Likewise.

	* src/sdiff.c: Likewise.

	* src/system.h: Likewise.

	* src/util.c: Likewise.

	* src/ifdef.c: Fix typo: "GNU DIFF General Public License" should be

	"GNU General Public License".  Reported by Erich Guenther.

	* src/side.c: Likewise.

2007-06-18  Paul Eggert  <eggert@cs.ucla.edu>

	* bootstrap.conf (gnulib_modules): Add inttypes.

	* src/context.c (print_context_label): Don't assume that time_t

	fits in long int, since it doesn't in FreeBSD/arm.  Problem

	reported by Xin Li in

	<http://lists.gnu.org/archive/html/bug-gnu-utils/2007-06/msg00091.html>.

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

	* NEWS:  Mention new sdiff aliases 1 and 2 for l and r.

	* doc/diff.texi (Merge Commands): Likewise.

	* src/sdiff.c (give_help): Give help for them.

	(edit): Support them.

2007-04-11  Paul Eggert  <eggert@cs.ucla.edu>

	* doc/diff.texi (Detailed diff3 Normal): "range is a singleton" ->

	"there is only one line", for clarity.  Suggested by Jerry Peek.

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

	* TODO: Mention possible sdiff improvement.

	* bootstrap: Sync from gnulib.

	* src/cmp.c: Don't include exit.h; no longer needed.

	* src/diff.c: Likewise.

	* src/sdiff.c: Likewise.

	* src/dir.c: Don't include strcase.h; no longer needed.

	* README-alpha: Remove, replacing with:

	* README-hacking: New file, taken from coreutils with some changes.

	The rename is required by the change to 'bootstrap'.

2006-11-15  Paul Eggert  <eggert@cs.ucla.edu>

	* src/analyze.c (build_reverse_script): Fix typo in comment.

	Problem and fix reported by Daniel Hipschman.

2006-11-14  Paul Eggert  <eggert@cs.ucla.edu>

	Don't assume SIGPIPE exists, and that sigblock and sigsetmask

	exist if sigprocmask does not.  Problem reported by Paul Edwards

	for MVS 3.8.

	* configure.ac (sigblock): Check whether this function is

	available, if sigprocmask is not.

	* src/sdiff.c (sigs): Omit SIGPIPE if it's not defined.

	Put SIGINT last; all uses changed.

	(handler_index_of_SIGPIPE): Omit if SIGPIPE is not defined.

	(sigblock, sigsetmask) [!HAVE_SIGBLOCK]: New macros.

	(sigprocmask): Don't dump core if O is null.

2006-11-04  Paul Eggert  <eggert@cs.ucla.edu>

	* src/sdiff.c (sigprocmask) [! HAVE_SIGPROCMASK]: Cast 2nd arg to

	sigset_t *, since it might be a literal 0.  Problem reported by

	Paul Edwards for MVS 3.8.

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

	* NEWS: diff -u no longer outputs trailing white space unless the

	input data has it.  Suggested by Jim Meyering.

	* doc/diff.texi (Detailed Unified): Document this.

	* src/context.c (pr_unidiff_hunk): Implement this.

	Modernize bootstrap procedure to match current gnulib.

	* bootstrap: Sync with coreutils bootstrap, except check that

	the directory build-aux exists before trying to copy to it.

	* bootstrap.conf: New file.

	(gnulib_modules): Add config-h, dup2, extensions, fcntl, fdl,

	stat-macros, unistd.

	* configure.ac: Invoke gl_EARLY and gl_INIT rather than

	GNULIB_AUTOCONF_SNIPPET.

	(AC_CONFIG_HEADER): Rename config.h to lib/config.h.

	(AC_CHECK_HEADERS_ONCE): Don't check for fcntl.h, locale.h,

	sys/file.h, unistd.h.  We now use the fcntl and unistd modules,

	and locale.h can be assumed for any C89 compiler.

	(DIFFUTILS_PREREQUISITES): Remove.  No longer needed now that

	we use the stdint module.

	(AC_CHECK_FUNCS_ONCE): Remove dup2, which is no longer needed

	now that we use the dup2 module.

	(AM_GNU_GETTEXT): Use need-formatstring-macros, and ...

	(AM_GNU_GETTEXT_VERSION): specify version 0.15 instead of 0.14.5,

	to be consistent with coreutils.

	* lib/Makefile.am (noinst_LIBRARIES):

	(lib_SOURCES, libdiffutils_a_LIBADD):

	(libdiffutils_a_DEPENDENCIES, BUILT_SOURCES, EXTRA_DIST):

	(MOSTLYCLEANFILES): Remove; now computed automatically.

	(noinst_HEADERS, libdiffutils_a_SOURCES): Just append

	our special files now.

	* lib/cmpbuf.c: Include config.h unconditionally, since we

	no longer define HAVE_CONFIG_H.

	* lib/prepargs.c: Likewise.

	* src/Makefile.am (LDADD): Use $(LIBINTL), not @LIBINTL@.

	(diff_LDADD): Use $(LIB_CLOCK_GETTIME), not @LIB_CLOCK_GETTIME@.

	* src/dir.c (dir_read): Use _D_EXACT_NAMLEN, not NAMELEN.

	* src/system.h (volatile): Remove, since we assume C89 or better.

	Include stat-macros.h.

	(S_IRWXU, S_IRWXG, S_IRWXO, S_IRUSR, S_IWUSR):

	Remove, since we now use stat-macros.h.

	(SEEK_SET, SEEK_CUR): Remove, since we assume C89 or better.

	Include unistd.h unconditionally, since we use unistd.

	Likewise for fcntl.h.

	(dup2): Remove, since we now use dup2.

	(O_RDONLY, O_RWDR, O_BINARY): Remove, since we now use

	fcntl.

	Include dirent.h unconditionally.

	(NAMLEN): Remove, replacing with....

	(_D_EXACT_NAMLEN): New macro.

	Include inttypes.h unconditionally.

	(PTRDIFF_MAX, SIZE_MAX, UINTMAX_MAX, strtoumax): Remove, since

	we now use inttypes.

	Include locale.h unconditionally.

	(setlocale): Remove, since we now assume locale.h.

2006-09-04  Jim Meyering  <jim@meyering.net>

	* src/context.c (print_context_function): Do not print

	trailing white space in a context header.

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

	* src/cmp.c (cmp): The previous fix wasn't quite right either, as

	it mishandled 'cmp A B >/dev/null' when A is shorter than B and

	differs before A's end-of-file, by outputting a bogus EOF message.

	Also, it was inefficient if A and B were large.

2006-05-07  Jim Meyering  <jim@meyering.net>  (tiny change)

	Fix bug introduced in 2006-03-09 change:

	cmp always exits successfully, when stdout is redirected to /dev/null.

	* src/cmp.c (cmp): When there's a difference, arrange to return nonzero

	also when comparison_type is the new (from 2006-03-09) type_no_stdout.

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

	* src/context.c (pr_context_hunk, pr_unidiff_hunk):

	Prefer fputs or fputc to fprintf, since it's a tad more efficient

	with unlocked-IO on glibc.  Long ago we avoided fputs to

	work around an ancient SunOS bug, but that's no longer relevant.

	* src/diff3.c (output_diff3, dotlines, undotlines):

	(output_diff3_edscript, output_diff3_merge): Likewise.

	This also avoids a gcc -Wformat-security warning reported

	by Jim Meyering.

	* src/ed.c (print_ed_hunk, print_forward_ed_hunk, print_rcs_hunk):

	Likewise.

	* src/normal.c (print_normal_hunk): Likewise.

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

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

	introduced in the 2001-11-25 change: the code to remove the

	identical suffix also looked at the trailing sentinel, which meant

	the common suffix length was always incorrectly calculated to be

	zero.  Problem and fix reported by Daniel Hipschman.  Instead of

	his fix, revert to the pre-2001 code.

	* doc/diff.texi: Switch from GFDL 1.1 to 1.2.

2006-03-13  Paul Eggert  <eggert@cs.ucla.edu>

	* src/system.h (PARAMS, PROTOTYPES): Remove; no longer needed.

	(IF_LINT): New macro, to pacify GCC.

	* src/analyze.c (diag, compareseq): Use IF_LINT.

	* src/cmp.c (cmp): Likewise.

	* src/diff3.c (process_diff): Likewise.  Also, prefer NULL to 0.

	* src/ifdef.c (do_printf_spec, scan_char_literal): Likewise.

	* src/sdiff.c (edit): Likewise.

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

	* src/cmp.c (type_no_stdout): New constant.

	(main): Use it to avoid bug when the "EOF on foo" message is

	generated and stdout is /dev/null.

	Problem reported by Vincent Lefevre (Debian bug 356083).

2006-01-04  Paul Eggert  <eggert@cs.ucla.edu>

	* README-alpha: Describe CVS access better, using the README-alpha

	from GNU tar.

	* AUTHORS: Simplify list by removing legalisms.

	* THANKS: Add Larry Wall, who contributed to manual.  Update email

	addresses.

	* Makefile.am (SUBDIRS): Remove m4.  Put lib first, then other

	source files, so documentation can rely on programs being built.

	* bootstrap: Import changes from Bison bootstrap.  Add gettext,

	gettime, sh-quote, stat-time, verify, version-etc-fsf modules.

	Remove posixver module.  Retrieve doc/fdl.texi from gnulib.

	Handle gettext.m4 like glibc21.m4.  Don't remove po/en.po.

	* configure.ac (AC_PREREQ): Bump to 2.59.

	(AC_INIT): Bump version to 2.8.7-cvs.

	(AC_CONFIG_AUX_DIR): Change from config to build-aux.

	Prefer AC_CHECK_HEADERS_ONCE to AC_CHECK_HEADERS

	and AC_CHECK_FUNCS_ONCE to AC_CHECK_FUNCS.

	Remove jm_AC_TYPE_INTMAX_T, jm_AC_TYPE_UINTMAX_T,

	AC_STRUCT_ST_MTIM_NSEC.

	(DIFFUTILS_PREREQUISITES): New macro.  Call it.

	(REGEX_MALLOC): Remove; no longer needed.

	(AM_GNU_GETTEXT_VERSION): Now 0.14.15.

	(AM_GNU_GETTEXT): Call.

	(LIB_CLOCK_GETTIME): Remove; bootstrap now does that.

	(AC_FUNC_SETMODE_DOS): Remove.

	(AC_CONFIG_FILES): Remove m4/Makefile.

	* doc/diff.texi: Use @- at end of lines that should end in white space,

	so that Emacs doesn't remove the white space.

	(diff Options): "diff -NUM" is a pure extension to POSIX, so support

	it unconditionally.

	* lib/Makefile.am (noinst_HEADERS): Remove quotesys.h.

	(lib_SOURCES): Remove quotesys.c.

	(DISTCLEANFILES): Remove.

	(EXTRA_DIST): Remove setmode.h, waitpid.c.

	* lib/cmpbuf.c (block_read): Reword to avoid gcc -W warning.

	* lib/setmode.c, lib/setmode.h: Remove.

	* m4/setmode.m4, m4/gnu-source.m4, m4/Makefile.am.in: Remove.

	* m4/jm-glibc-io.m4: Remove.

	* src/cmp.c: Don't include <setmode.h>.

	(specify_ignore_initial): Reword to avoid gcc -W warnings.

	(main): Use freopen instead of setmode, since freopen is in POSIX.

	* src/context.c: Revert most 2004-09-01 changes.  Then:

	(TIMESPEC_NS): Remove.  All uses replaced by

	get_stat_mtime_ns.

	Include stat-time.h, strftime.h.

	(nstrtime): Remove decl.

	* src/diff.c: Revert most 2004-09-01 changes.  Then:

	Don't include <posixver.h>, <quotesys.h>, <setmode.h>.

	Include <sh-quote.h>, <stat-time.h>, <timespec.h>.

	All uses of quotesys replaced by sh-quote.

	(main, compare_files):

	Use freopen instead of setmode, since freopen is in POSIX.

	(main): Don't complain about "diff -NUM'.

	(main, set_mtime_to_now):

	Adjust to stat-time.h macros when accessing nanoseconds.

	* src/diff3.c: Include sh-quote.h rather than quotesys.  All uses

	changed.

	* src/dir.c (dir_read): excluded_filename renamed to

	excluded_file_name.

	* src/io.c: Don't include <setmode.h>.

	(sip, read_files): Remove binary file stuff, leaving a FIXME behind.

	A DOS expert needs to look at this.

	* src/diff.c: Include sh-quote.h rather than quotesys.h.

	All uses changed.

	* src/system.h: Include verify.h.

	(verify): Remove.  All uses changed to verify.h version.

	Include <intprops.h>.

	(TYPE_SIGNED, TYPE_MINIMUM, TYPE_MAXIMUM): Remove.  Now uses

	intprops.h versions.

	(O_BINARY): New defns, taken from coreutils.

	* src/util.c: Include sh-quote.h rather than quotesys.h.

	All uses changed.

2004-09-01  Paul Eggert  <eggert@cs.ucla.edu>

	* src/diff.c (recursive, new_file, unidirectional_new_file):

	(report_identical_files):

	Move into struct diffopt.  All uses changed.

	(exclude_options, compare_files, specify_style, check_stdout):

	New arg OPT.  All uses changed.

	(GDIFF_MAIN): Remove.  All uses removed.

	(function_regexp_list, ignore_regexp_list): No longer static; now

	locals in 'main'.

	(main): Set opt.function_regexp, opt.ignore_regexp if using regexps;

	all other code now tests these pointers rather than inspecting fastmap

	internals.

	New local OPT to hold former statics; initialize it.

	(init_regexp_list): New function, used by main.

	(summarize_regexp_list): Now returns struct re_pattern_buffer *, and

	assumes reglist->regexps is not NULL.  All uses changed.

	* src/context.c (find_function_last_search): Move into struct diffopt.

	All uses changed.

	(pr_context_label, pr_context_header,

	print_context_script, find_function, find_hunk, mark_ignorable,

	pr_context_hunk, pr_unidiff_hunk): New arg OPT.  All uses changed.

	(print_context_number_range,

	print_unidiff_number_range): New arg OUT.  All uses changed.

2004-07-19  Stepan Kasal  <kasal@ucw.cz>

	* src/ed.c (print_ed_hunk): Optimize the case where an insert's

	last line is a single-dot line.

2004-06-30  Paul Eggert  <eggert@cs.ucla.edu>

	* lib/setmode.c:

	Don't include <stdbool.h>, since setmode.h now does this.

	Include setmode.h first, to catch interface errors.

	Assume HAVE_SETMODE_DOS is defined.

	* lib/setmode.h: Include stdbool.h.

2004-04-26  Paul Eggert  <eggert@cs.ucla.edu>

	* bootstrap: Don't remove po/en.po.

2004-04-13  Paul Eggert  <eggert@twinsun.com>

	* NEWS, configure.ac (AC_INIT): Version 2.8.7.

	* configure.ac (AM_GNU_GETTEXT_VERSION): Add.

	(XGETTEXT): Restore from pre-2004-04-12 version.  This fixes

	a bug that lost many msgids in doc/diffutils.pot.

	* bootstrap: New file.

	* exgettext: Don't generate a temporary file, as this runs afoul

	of "make distcheck" which operates with read-only directories.

	* Makefile.am (EXTRA_DIST): Add bootstrap.

	Remove config/config.rpath as it is deduced automatically these days.

2004-04-12  Paul Eggert  <eggert@twinsun.com>

	* NEWS, configure.ac (AC_INIT): Version 2.8.6.

	* NEWS: Add news for 2.8.4, 2.8.6.

	* README: Move copyright notice to end.  Defer to "configure

	--help" for special "configure" options.  Suggest latest libiconv.

	Update version numbers of Autoconf etc. to current.

	* configure.ac: Quote various arguments better.

	(AC_CONFIG_MACRO_DIR): Add call, specifying "m4".

	(AC_CONFIG_HEADER): Replaces AM_CONFIG_HEADER.

	(gl_USE_SYSTEM_EXTENSIONS): Replaces AC_GNU_SOURCE.

	(AC_ISC_POSIX): Remove; nobody ports to ancient ISC any more.

	(AC_PROG_CPP, AC_PROG_INSTALL, AC_C_INLINE,

	AC_HEADER_STDBOOL, AC_HEADER_STDC, AM_GNU_GETTEXT, XGETTEXT,

	AC_HEADER_STAT, AC_FUNC_VPRINTF, jm_FUNC_GLIBC_UNLOCKED_IO,

	jm_FUNC_GNU_STRFTIME, jm_FUNC_MALLOC, jm_FUNC_REALLOC,

	jm_PREREQ_C_STACK, jm_PREREQ_ERROR, jm_PREREQ_HARD_LOCALE,

	jm_PREREQ_QUOTEARG, jm_PREREQ_REGEX, AC_FUNC_FNMATCH_GNU, jm_AC_DOS):

	Remove; not needed here, as our files don't use them directly

	or we rely on gnulib modules.

	(AC_C_CONST): Remove; we assume C89 now.

	(AC_CHECK_HEADERS): Remove libintl.h, limits.h, stdlib.h, string.h,

	time.h.

	(AC_CHECK_TYPE): Remove ptrdiff_t, ssize_t.

	(AC_CHECK_FUNCS): Remove diraccess, strchr, strerror, tmpnam).

	(AC_REPLACE_FUNCS): Remove memchr, mkstemp, strcasecmp.

	(GNULIB_AUTOCONF_SNIPPET): Add call.  This replaces much of

	the above.

	(AC_CONFIG_FILES): Remove lib/posix/Makefile.

	(AC_CONFIG_COMMANDS): Remove.

	* doc/diff.texi (dircategory): Change to "Text creation and

	manipulation" from "GNU packages".

	(Translations): New node.

	(Overview): Improve quality of algorithm citations.

	(Binary): -q doesn't exactly cause diff to assume files are binary.

	(Normal): Place after Side by Side, since it's less important.

	(Detailed Context, Detailed Unified, Detailed ed,

	Detailed if-then-else, diff3 Hunks, Detailed diff3 Normal):

	Place at end of menu.

	(Detailed Unified): Mention that fractional timestamps are

	omitted on hosts that don't support them.

	Mention what happens when hunks contain just one line.

	(Line Group Formats, Reject Names): Fix duplicate-word typos.

	(Comparing Directories): Trailing white space and empty lines are

	ignored in the -X file.

	(diff Options): Add --strip-trailing-cr.

	(Projects): gnu -> gvc@gnu.org.

	* lib/Makefile.am (SUBDIRS): Remove.

	(EXTRA_DIST, noinst_HEADERS): Remove most entries.

	(libdiffutils_a_SOURCES): Now just lib_SOURCES.

	(lib_SOURCES): New macro.

	(DISTCLEANFILES, MOSTLYCLEANFILES): Set to empty now.

	(gnulib.mk): Include: this does most of the work eliminated

	by the above changes.

	* lib/inttostr.c (inttostr): Protect i < 0 by compile-time

	test intended to suppress compiler warnings.

	* lib/inttostr.h: Include limits.h unilaterally.

	(CHAR_BIT): Remove.

	(PARAMS): Remove; all uses changed.

	* lib/setmode.c (__attribute__): New macro.

	(set_binary_mode): Define only if HAVE_SETMODE_DOS.

	Otherwise define a dummy static char, as C89 requires

	that we define something.

	* lib/setmode.h (set_binary_mode): Return true, not 1.

	* src/analyze.c, src/context.c, src/diff.c, src/io.c, src/util.c:

	Do not include regex.h, as diff.h does this now.

	* src/cmp.c: Sort includes.  Include <exit.h>, <unlocked-io.h>.

	(specify_comparison_type): Don't report an error if the comparison

	type has already been specified the same way as this one.

	* src/cmp.c (usage): Mention exit status.

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

	* src/diff3.c (usage): Likewise.

	* src/sdiff.c (usage): Likewise.

	* src/cmp.c (main): Adjust to latest gnulib c_stack_action

	calling conventions.

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

	* src/diff3.c (main): Likewise.

	* src/sdiff.c (main): Likewise.

	* src/cmp.c (main): Adjust to latest version_etc calling conventions.

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

	* src/diff3.c (main): Likewise.

	* src/sdiff.c (main): Likewise.

	* src/diff.c: Include <exit.h>.

	(binary): Define to true if not declared.

	(longopts): Set tabsize flag to 1.

	(main): Don't output nanoseconds if platform lacks them.

	Don't treat files as binary if !binary.

	(set_mtime_to_now): Use 0, not NULL.

	(compare_files): Mark files as nonexistent if it looks like

	'patch' created inaccessible regular empty files to denote

	nonexistent backups.  Don't compare such files.

	Clear st_* members of status of	nonexistent file.

	Remove now-unnecessary tests.

	* src/diff.h: Include regex.h, unlocked-io.h.

	(struct file_data.changed): Now char *, not bool *, to save

	space on hosts where bool takes more space than char.

	All uses changed.

	* src/diff3.c: Include unlocked-io.h.

	(strip_trailing_cr): New var.

	(STRIP_TRAILING_CR_OPTION): New enum.

	(longopts, main, option_help_msgid, read_diff):

	Add --strip-trailing-cr support.

	(read_diff): Exit with status 126 (not 127) if errno != ENOENT

	after failed execvp in child.  Report this in parent.

	* src/dir.c: Include <strcase.h>.

	(failed_locale_specific_sorting): Renamed from failed_strcoll.

	All uses changed.

	(compare_names): Don't invoke strcasecmp first thing when

	ignore_file_name_case; if locale_specific_sorting, we should

	just use that.

	* src/ifdef.c (next_line): Remove; replace with...

	(next_line0, next_line1): New vars.

	(print_ifdef_script, print_ifdef_hunk):

	Use them to fix line-number computation bug.

	* src/io.c (find_and_hash_each_line): Don't convert char *

	to unsigned char *; just leave pointers as char *.  This

	lessens the number of potentially-dangerous casts.

	* src/util.c (lines_differ): Likewise.

	* src/sdiff.c: Include <unlocked-io.h>, <exit.h>.

	(check_child_status): Renamed from ck_editor_status, and

	accept a new arg MAX_OK_STATUS.  All callers changed.

	Handle status 126/127 as per POSIX.

	(edit): Likewise.

	(main): Likewise.  Fix getopt typo: -E wasn't supported.

	* src/system.h (S_IRWXU, S_IRWXG, S_IRWXO): Define if not defined.

	(S_IXUSR, S_IXGRP, S_IXOTH): Remove.

	Include <time.h> unconditionally, since we can assume C89 now.

	Likewise for <stdlib.h>, <string.h>.

	(getenv, EXIT_SUCCESS, EXIT_FAILURE, SSIZE_MAX, strchr, strrchr,

	memcmp, memcpy): Remove decl; no longer needed.

	(strcasecoll, strcasecmp): Define if not built in.

	(CTYPE_DOMAIN, ISPRINT, ISSPACE, TOLOWER, _tolower, errno): Remove;

	we now assume C89 or better.  All uses changed.

	Include <stdbool.h> unconditionally now, since gnulib supports it

	if the C compiler doesn't.  All boolean uses of 0 and 1 now

	changed to false and true.

	(lin_is_printable_as_long_int): Renamed from lin_is_printable_as_long.

	* src/util.c (begin_output): Fix bug: 0 wasn't cast to char * arg,

	which led to undefined behavior on 64-bit hosts.

	Use more-standard test for exit status 126 versus 127.

	(finish_output): Likewise.

	(analyze_hunk): Do not cast bool to int.

2004-03-15  Paul Eggert  <eggert@twinsun.com>

	* src/cmp.c (main): Don't consider two files with the same name to

	be the same, if their initial skip values differ.  This fixes a

	bug reported by Hideki Iwamoto in

	<http://mail.gnu.org/archive/html/bug-gnu-utils/2004-03/msg00024.html>.

2004-03-11  Paul Eggert  <eggert@twinsun.com>

	* src/analyze.c (diag): Return void, not lin, since the return

	value wasn't needed.  All callers changed.

	(diag, diff_2_files):

	Use 'true' and 'false' instead of '1' and '0', when appropriate.

	(compareseq): Use lin const * local variables instead of lin *.

	Don't bother checking diag's return value.

	(shift_boundaries, build_reverse_script, build_script, diff_2_files):

	Use char arrays, not bool arrays, since

	sizeof (bool) might be greater than 1.

2004-02-09  Paul Eggert  <eggert@twinsun.com>

	* m4/setmode.m4 (AC_FUNC_SETMODE_DOS): AC_LIBOBJ(setmode) if

	we would return true.

2002-10-14  Paul Eggert  <eggert@twinsun.com>

	* src/Makefile.am (diff3.$(OBJEXT), diff.$(OBJEXT),

	sdiff.$(OBJEXT)): Rename from (misspelled) diff3.$(OBJECT),

	diff.$(OBJECT), sdiff.$(OBJECT).  Patch by Paul D. Smith in

	<http://mail.gnu.org/pipermail/bug-gnu-utils/2002-October/003251.html>.

	Bug reported by Chris Bainbridge.

2002-10-13  Paul Eggert  <eggert@twinsun.com>

	* src/Makefile.am (MOSTLYCLEANFILES): Add paths.ht.

	(paths.h): Send output to paths.ht first, and then rename to

	paths.h at the end.  This avoids problems if the disk is full.

	It also works around what appears to be a bug with GNU make -j

	(3.79.1); see <http://bugs.gentoo.org/show_bug.cgi?id=8934>.

2002-06-27  Paul Eggert  <eggert@twinsun.com>

	* NEWS, configure.ac (AC_INIT): Version 2.8.4.

	* config/config.sub: Sync with latest version maintained in other

	packages.

	* lib/file-type.h: Protect against double inclusion.  Detect

	whether <sys/stat.h> has been included.  Fix from Jim Meyering.

	* src/analyze.c (briefly_report): Don't say "Binary files differ",

	since one of the files may not be a binary file.

	Bug reported by Dan Jacobson.

2002-06-22  Paul Eggert  <eggert@twinsun.com>

	* lib/c-stack.c (segv_handler, c_stack_action) [! defined

	SA_SIGINFO]: Do not assume SA_SIGINFO behavior.

	Bug reported by Jim Meyering on NetBSD 1.5.2.

2002-06-16  Paul Eggert  <eggert@twinsun.com>

	* NEWS, configure.ac (AC_INIT): Version 2.8.3.

	* config/depcomp, config/missing, README: Update to automake 1.6.2.

	* po/LINGUAS: Add en_US.

	* po/en_US.po: New file.

	* po/POTFILES.in: Remove lib/freesoft.c.

	Add lib/file-type.c, lib/version-etc.c, lib/xmalloc.c.

2002-06-15  Paul Eggert  <eggert@twinsun.com>

	* doc/diff.texi (Special Files): Document behavior of symlink

	loops.

	* lib/Makefile.am (noinst_HEADERS): Remove freesoft.h.

	Add version-etc.h.

	(libdiffutils_a_SOURCES): Remove freesoft.c.  Add version-etc.c.

	* lib/freesoft.c, lib/freesoft.h: Remove.

	* lib/version-etc.h (PARAMS): Remove; we now assume C89 at least.

	* lib/version-etc.h (version_etc): Remove package and version args.

	(version_etc_copyright): Remove.

	* lib/version-etc.c: Likewise.

	Do not include unlocked-io.h; no longer needed.

	Include gettext.h rather than libinto.h.

	(_): Define unconditionally.

	(version_etc): Adjust wording to match current GNU coding standards.

	Translate "(C)" if possible.

	* lib/version-etc.c, lib/version-etc.h: New files, taken from

	fileutils.

	* src/Makefile.am (cmp_SOURCES, diff3_SOURCES, sdiff_SOURCES,

	diff_SOURCES): Remove version.c.

	(MAINTAINERCLEANFILES, $(srcdir)/version.c): Remove.

	* src/cmp.c: Include version-etc.h, not freesoft.h.

	(copyright_notice): Remove.

	(main): Use version_etc to print version.

	* src/diff.c, src/diff3.c, src/sdiff.c: Likewise.

	* src/cmp.c (version_string): Remove decl.

	* src/diff.h, src/diff3.c, src/sdiff.c: Likewise.

2002-06-11  Paul Eggert  <eggert@twinsun.com>

	* lib/fnmatch.c, lib/fnmatch_loop.c (WIDE_CHAR_SUPPORT):

	New macro.  Use it uniformly instead of

	(defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H).

	It also uses HAVE_BTOWC, to fix a porting bug on Solaris 2.5.1

	reported by Vin Shelton.

	* m4/fnmatch.m4 (_AC_LIBOBJ_FNMATCH): Check for btowc.

	* NEWS, configure.ac (AC_INIT): Version 2.8.2.

	* ABOUT-NLS, config/config.guess, config/config.sub,

	config/depcomp, config/texinfo.tex, lib/posix/regex.h,

	m4/c-bs-a.m4, m4/gettext.m4, m4/gnu-source.m4, m4/lib-link.m4,

	m4/malloc.m4:

	Update to recent version (maintained in other packages).

	* m4/prereq.m4 (jm_PREREQ_EXCLUSIVE): AC_FUNC_FNMATCH_GNU

	no longer takes a lib.

	* README: Incorporate contents from INSTALLME.

	* INSTALLME: Remove.

	* Makefile.am (EXTRA_DIST): Remove INSTALLME.

	* configure.ac (AC_GNU_SOURCE): Move up, so that it affects

	later compilations properly.

	(DEFAULT_DIFF_PROGRAM, AC_TYPE_SIGNAL): Remove.

	(jm_AC_TYPE_INTMAX_T): Add.

	(AC_FUNC_FNMATCH_GNU): Use this, instead of AC_FUNC_FNMATCH.

	(AC_CONFIG_LINKS): regex.hin renamed from regex_.h.

	* doc/diff.texi: Reword "@option{-f} and @option{--foo}" to

	"@option{-f} or @option{--foo}".

	Use @acronym instead of @sc where appropriate.

	(Specified Lines): Renamed from Specified Folding.

	(Comparison, Blank Lines):

	Clarify wordings for Blank Lines and Specified Lines nodes.

	(Binary): Mention --verbose and --print-bytes.

	(Tabs, sdiff Option Summary, diff Options):

	New option --tabsize=COLUMNS.

	* lib/Makefile.am (EXTRA_DIST): Add fnmatch_loop.c.

	(noinst_HEADERS): fnmatch_.h renamed from fnmatch.hin.

	regex_.h renamed from regex.hin.

	Add file-type.h.

	(libdiffutils_a_SOURCES): Add file-type.c.

	(DISTCLEANFILES): Remove fnmatch.hno, regex.hno.

	* lib/c-stack.c (__attribute__): New macro.

	(EOVERFLOW): Define if not defined.

	(stack_t): Define to struct sigaltstack if not defined or declared.

	Include <sys/resource.h>, <ucontext.h> if available.

	Include <stdio.h> if DEBUG.

	Do not include <inttypes.h> or <stdint.h>.

	(c_stack_die): Remove info and context args.  All uses changed.

	(segv_action): Likewise.

	(alternate_signal_stack): Change uintmax_t to long, to ease porting.

	(get_stack_location, min_address_from_argv, max_address_from_argv,

	null_action): New functions.

	(stack_base, stack_size): New vars.

	(segv_handler): context arg may not be used.

	Use global stack_base, stack_size if

	! HAVE_XSI_STACK_OVERFLOW_HEURISTIC.

	Add debug code.

	Invoke die (rather than segv_action) to exit.

	(c_stack_action): Accept new argv arg, and simpler handler arg.

	All uses changed.  Move code into new functions above.

	Allow null action.

	[! (defined SA_ONSTACK && defined _SC_PAGESIZE)]: Assume all segvs

	are stack overflows.

	(main) [DEBUG]: Describe what output should be like.

	* lib/c-stack.h (siginfo_t, c_stack_die): Remove decl.

	* lib/file-type.c, lib/file-type.h: New files.  These contain code

	that was in src/diff.c, but is now librarified and spiffed up a

	bit.  Jim Meyering suggested this.

	* lib/fnmatch.c (alloca, __builtin_expect): Define for non-GCC hosts.

	<strings.h>: Include only if HAVE_STRINGS_H.

	<stddef.h>: Include if we include stdlib.h.

	Do not comment out all code if ! HAVE_FNMATCH_GNU.

	(getenv): Do not declare if HAVE_DECL_GETENV.

	(__strchrnul, __wcschrnul): Remove; not used.

	(MEMPCPY): Use mempcpy if not _LIBC; use memcpy if neither _LIBC

	nor HAVE_MEMPCPY.

	(FOLD) [HANDLE_MULTIBYTE]: Do not pass wide char to ISUPPER.

	(STRLEN, STRCAT, MEMPCPY) [HANDLE_MULTIBYTE && !defined _LIBC]:

	Use wcslen rather than __wcslen, and likewise for wcscat, wmempcpy.

	(MEMPCPY) [HANDLE_MULTIBYTE]: Use wmempcpy if not _LIBC; use wmemcpy

	if neither _LIBC nor HAVE_WMEMPCPY.

	* lib/fnmatch_.h (__const): Do not define to empty, as this breaks

	Sun cc.  The code doesn't work with K&R anyway.

	* lib/fnmatch_loop.c (struct patternlist.str): Size 1, not 0,

	as C89 requires this.

	(NEW_PATTERN): Use offsetof, not sizeof, since str now has size 1.

	* lib/fnmatch_.h: Import from glibc fnmatch.h.

	* lib/fnmatch.c, lib/fnmatch_loop.c: Import from glibc.

	* lib/posixver.c: Include posixver.h.

	* lib/regex_.h: Renamed from lib/regex.hin.

	* m4/c-stack.m4 (jm_PREREQ_C_STACK): Do not AC_REQUIRE

	jm_AC_TYPE_UINTMAX_T and do not use uintmax_t.

	Check for sys/resource.h, uccontext.h.

	Check for decls and existence of getcontext, sigaltstack.

	Check for stack_t.

	* m4/codeset.m4, m4/glibc21.m4, m4/lcmessage.m4: Remove.

	* m4/fnmatch.m4: Update to latest Autoconf CVS for AC_FUNC_FNMATCH_GNU.

	* m4/gnu-source.m4: Likewise, for AC_GNU_SOURCE (renamed from

	AC__GNU_SOURCE).

	* m4/mbstate_t.m4 (AC_TYPE_MBSTATE_T): Renamed from AC_MBSTATE_T.

	All uses changed.  Upgrade to recent Autoconf CVS.

	* m4/stdbool.m4 (AC_HEADER_STDBOOL): Do not cast pointer to

	bool in integer constant expression; C99 does not allow it.

	Reported by Bruno Haible.

	* po/LINGUAS: Add hu, pt_BR.

	* po/hu.po, po/pt_BR.po: New files.

	* src/Makefile.am (noinst_HEADERS): Remove diff.h.

	(DEFS): Remove.

	(diff_sources): Add diff.h.

	(MOSTLYCLEANFILES): New macro.

	(cmp.$(OBJEXT) diff3.$(OBJECT) diff.$(OBJECT) sdiff.$(OBJECT)): Depend

	on paths.h.

	(paths.h): New rule.

	* src/analyze.c, src/cmp.c, src/diff.c, src/diff3.c, src/io.c,

	src/sdiff.c: Include <file-type.h>.

	* src/cmp.c: Include paths.h.

	(copyright_notice): Renamed from copyright_string.

	Now a msgid, so that copyright symbol can be translated.

	All uses changed.

	* src/diff.c, src/diff3.c, src/sdiff.c: Likewise.

	* src/diff.c: Include posixver.h.

	(TABSIZE_OPTION): New constant.

	(main): Allow widths up to SIZE_MAX.

	(filetype): Move to lib/file-type.c and rename to file_type.

	All uses changed.

	* src/diff.c (longopts, main, usage): New option --tabsize=COLUMNS.

	* src/io.c (find_and_hash_each_line): Likewise.

	* src/diff.h (TAB_WIDTH): Remove.

	(tabsize): New decl.

	(sdiff_half_width, sdiff_column2_offset): Now size_t rather than

	unsigned int.

	* src/diff3.c (skipwhite, readnum): New functions.

	(process_diff_control): Use them.

	(SKIPWHITE, READNUM): Remove.

	(read_diff): Don't worry about errno == ENOEXEC.

	* src/sdiff.c (catchsig, signal_handler, initial_action): Signal

	handlers return void, not RETSIGTYPE, since we no longer support

	K&R.

	(TABSIZE_OPTION): New constant.

	(longopts, usage, main): New option --tabsize=COLUMNS.

	(cleanup): New arg signo.  All uses changed.

	(ck_editor_status, main, edit): Don't worry about ENOEXEC.

	* src/side.c (tab_from_to, print_half_line, print_1sdiff_line):

	New option --tabsize=COLUMNS.

	* src/system.h (S_ISBLK, S_ISCHR, S_ISDIR, S_ISFIFO, S_ISREG,

	S_ISSOCK): Remove; now in lib/file-type.h.

	* src/util.c (finish_output): Check for ENOEXEC.

	(lines_differ, output_1_line): New option --tabsize=COLUMNS.

	(analyze_hunk): If -b or -w is also specified, -B now considers

	lines to be empty if they contain only white space.

2002-04-05  Paul Eggert  <eggert@sic.twinsun.com>

	* NEWS, configure.ac (AC_INIT): Version 2.8.1.

	* configure.ac (AC_HEADER_STDBOOL): Add.

	(AC_CHECK_HEADERS): Remove stdbool.h.

	* m4/stdbool.m4: New file.

	* m4/prereq.m4 (jm_PREREQ_EXCLUDE):

	Use AC_HEADER_STDBOOL rather than AC_CHECK_HEADERS(stdbool.h).

	(jm_PREREQ_HASH): Likewise.

	* src/system.h (SSIZE_MAX): Define if limits.h doesn't.

	* src/analyze.c (diff_2_files): Assign PTRDIFF_MAX - 1 to a