34 Commits

Author SHA1 Message Date
Jim Meyering
66f2f2d60a version 2.9
* NEWS: Record release date.
2010-02-11 10:45:20 +01:00
Jim Meyering
6a44886e24 maint: update all FSF copyright year lists to include 2010
Use this command:
git ls-files |grep -vE '^(\..*|COPYING|gnulib)$' |xargs \
env UPDATE_COPYRIGHT_USE_INTERVALS=1 build-aux/update-copyright
2010-01-01 16:18:27 +01:00
Jim Meyering
3850429db6 maint: bug-diffutils@gnu.org is the new bug-reporting address
* configure.ac (AC_INIT): Use bug-diffutils@..., not bug-gnu-utils
as the bug-reporting address.
* NEWS (Administrivia): Mention this.
* src/cmp.c (usage): Remove hard-coded address.
Instead, use gnulib's emit_bug_reporting_address function.
* src/diff.c (usage, option_help_msgid): Likewise.
* src/diff3.c (usage): Likewise.
* src/sdiff.c (usage): Likewise.
2009-11-16 22:40:43 +01:00
Jim Meyering
943b8a4383 sdiff, diff3: exec diff, not $(bindir)/diff
* src/Makefile.am (paths.h): Emit a definition of DEFAULT_DIFF_PROGRAM
that is simply "diff" (or whatever $(transform) would convert that to,
e.g., "gdiff").  This makes it so that tests can work without first
installing diff, and so that the binaries do not hard-code $(prefix).
* NEWS (Changes in behavior): Mention this.
2009-11-16 22:39:58 +01:00
Jim Meyering
9bfafb33a6 admin: update all copyright notices to include the year 2009 2009-11-11 22:18:37 +01:00
Jim Meyering
21ebf6648e maint/sc: enable check for duplicate "the"; fix one
* NEWS: s/the the/the/.
Adjust style to fit what some of the hooks and release tools expect.
* cfg.mk (local-checks-to-skip): Remove sc_the_the.
(old_NEWS_hash): Update.
2009-11-11 22:18:36 +01:00
Paul Eggert
e1820a76c0 * 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.
2009-11-11 14:08:06 +01:00
Paul Eggert
43e4846f11 * 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.
2007-07-19 17:45:29 +00:00
Paul Eggert
b8c8ac122f * 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-06-06 23:40:16 +00:00
Paul Eggert
10892a2dcc * NEWS: diff -u no longer outputs trailing white space unless the
input data has it.
2006-09-05 23:02:32 +00:00
Paul Eggert
f5c7610983 Update FSF address. 2006-01-05 07:23:55 +00:00
Paul Eggert
91b8605708 * 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.
2006-01-05 07:08:23 +00:00
Paul Eggert
4a1de90b3c Version 2.8.7. 2004-04-13 06:56:18 +00:00
Paul Eggert
477cd3074a Add news for 2.8.4, 2.8.6. 2004-04-12 07:44:35 +00:00
Paul Eggert
932176da4c Version 2.8.3. 2002-06-17 07:19:01 +00:00
Paul Eggert
d67b77f430 Version 2.8.2. 2002-06-11 05:53:54 +00:00
Paul Eggert
4921a4ab37 Doc fixes in 2.8.1. 2002-04-05 20:37:31 +00:00
Paul Eggert
a9d6b567a0 Diffutils 2.8. 2002-03-24 07:46:58 +00:00
Paul Eggert
89b6f2d6e5 cmp -l -s and cmp -s -l are not allowed. Use cmp -s or cmp -l instead.
Deprecate diff -h, -H, -L, -P, --inhibit-hunk-merge.
2002-03-12 07:16:19 +00:00
Paul Eggert
f88dc3e8ed Add man pages. 2002-03-11 07:08:45 +00:00
Paul Eggert
145637ede6 Reword to put POSIX first. 2002-02-28 07:35:36 +00:00
Paul Eggert
aa3a3c3a11 diff -NUM is now deprecated.
diff now takes the maximum of the specified contexts.
Conflicting options now cause an error again.
"Microsoft OSes" -> DGJPP
2002-02-28 07:26:14 +00:00
Paul Eggert
ffaecd082c (AC_INIT, AM_INIT_AUTOMAKE): Version 2.7.7.
Reformat for imminent 2.8 release.
2002-01-24 20:16:38 +00:00
Paul Eggert
5b9b018b29 * New diff3 and sdiff option: --diff-program=PROGRAM.
* The test-version environment variables DIFF_OPTIONS and DIFF_PROGRAM
  have been withdrawn, as they caused compatibility problems.
  You can use aliases or shell script wrappers instead.
2001-12-24 02:03:34 +00:00
Paul Eggert
f1db1aefd2 diffutils 2.7.5 2001-12-11 09:19:12 +00:00
Paul Eggert
a6def20a05 Test version 2.7.4. 2001-12-03 13:37:07 +00:00
Paul Eggert
6c994721a7 2.7.3 news 2001-11-25 06:33:50 +00:00
Paul Eggert
28adfd739a Mention --from-file=FILE, --to-file=FILE, ed. 1998-09-13 05:18:48 +00:00
Paul Eggert
5ce0e7349f 2.7.1 alpha news 1994-11-14 05:10:56 +00:00
Paul Eggert
4e44a14836 diffutils 2.7 news 1994-10-01 17:19:37 +00:00
Paul Eggert
675bab82c3 entered into RCS 1994-09-14 15:04:41 +00:00
Paul Eggert
3e4d9d4cac *** empty log message *** 1994-09-03 16:43:25 +00:00
Paul Eggert
5b318f266f *** empty log message *** 1993-11-10 08:28:27 +00:00
Paul Eggert
d6a38aed73 Initial revision 1993-09-27 06:30:18 +00:00