diff options
| author | Łukasz Stelmach <l.stelmach@samsung.com> | 2014-01-15 13:17:08 +0100 |
|---|---|---|
| committer | Łukasz Stelmach <l.stelmach@samsung.com> | 2014-01-15 13:17:08 +0100 |
| commit | 90b2de102fe4c773f9d6ba2da2065f254a5803b6 (patch) | |
| tree | e1fa3d099d6e8eeafd3dd0eef243b8d2f41a0b9b /doc | |
| parent | 20c6d7ec2c817aa561410130efc8c8254fbef2b2 (diff) | |
| download | diffutils-90b2de102fe4c773f9d6ba2da2065f254a5803b6.tar.gz diffutils-90b2de102fe4c773f9d6ba2da2065f254a5803b6.tar.bz2 diffutils-90b2de102fe4c773f9d6ba2da2065f254a5803b6.zip | |
Imported Upstream version 3.3upstream/3.3
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile.am | 2 | ||||
| -rw-r--r-- | doc/Makefile.in | 389 | ||||
| -rw-r--r-- | doc/diagmeet.note | 2 | ||||
| -rw-r--r-- | doc/diffutils.info | 552 | ||||
| -rw-r--r-- | doc/diffutils.texi | 64 | ||||
| -rw-r--r-- | doc/fdl.texi | 3 | ||||
| -rw-r--r-- | doc/stamp-vti | 8 | ||||
| -rw-r--r-- | doc/version.texi | 8 |
8 files changed, 562 insertions, 466 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 73e8a37..286f7a4 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,6 +1,6 @@ # Makefile for GNU diffutils documentation. -# Copyright (C) 2001-2002, 2009-2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2002, 2009-2013 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/doc/Makefile.in b/doc/Makefile.in index 9f31a87..56e2a7b 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11a from Makefile.am. +# Makefile.in generated by automake 1.13a from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # Makefile for GNU diffutils documentation. -# Copyright (C) 2001-2002, 2009-2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2002, 2009-2013 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -32,6 +31,23 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,27 +66,31 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = doc -DIST_COMMON = $(diffutils_TEXINFOS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/stamp-vti \ - $(srcdir)/version.texi +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(diffutils_TEXINFOS) $(top_srcdir)/build-aux/mdate-sh \ + $(srcdir)/version.texi $(srcdir)/stamp-vti \ + $(top_srcdir)/build-aux/texinfo.tex ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/btowc.m4 \ $(top_srcdir)/m4/c-stack.m4 $(top_srcdir)/m4/clock_time.m4 \ - $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \ - $(top_srcdir)/m4/configmake.m4 $(top_srcdir)/m4/dirname.m4 \ + $(top_srcdir)/m4/close.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/config-h.m4 $(top_srcdir)/m4/configmake.m4 \ + $(top_srcdir)/m4/dirname.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup2.m4 \ $(top_srcdir)/m4/eealloc.m4 $(top_srcdir)/m4/environ.m4 \ $(top_srcdir)/m4/errno_h.m4 $(top_srcdir)/m4/error.m4 \ - $(top_srcdir)/m4/extensions.m4 $(top_srcdir)/m4/fcntl-o.m4 \ + $(top_srcdir)/m4/exponentd.m4 $(top_srcdir)/m4/extensions.m4 \ + $(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \ $(top_srcdir)/m4/fcntl.m4 $(top_srcdir)/m4/fcntl_h.m4 \ - $(top_srcdir)/m4/filenamecat.m4 $(top_srcdir)/m4/float_h.m4 \ - $(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/fpieee.m4 \ - $(top_srcdir)/m4/freopen.m4 $(top_srcdir)/m4/getcwd.m4 \ + $(top_srcdir)/m4/fdopen.m4 $(top_srcdir)/m4/filenamecat.m4 \ + $(top_srcdir)/m4/float_h.m4 $(top_srcdir)/m4/fnmatch.m4 \ + $(top_srcdir)/m4/fpieee.m4 $(top_srcdir)/m4/freopen.m4 \ + $(top_srcdir)/m4/fstat.m4 $(top_srcdir)/m4/getcwd.m4 \ $(top_srcdir)/m4/getdtablesize.m4 $(top_srcdir)/m4/getopt.m4 \ - $(top_srcdir)/m4/getpagesize.m4 $(top_srcdir)/m4/gettext_gl.m4 \ + $(top_srcdir)/m4/getpagesize.m4 $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/gettime.m4 $(top_srcdir)/m4/gettimeofday.m4 \ - $(top_srcdir)/m4/glibc21_gl.m4 $(top_srcdir)/m4/gnu-make.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnu-make.m4 \ $(top_srcdir)/m4/gnulib-common.m4 \ $(top_srcdir)/m4/gnulib-comp.m4 \ $(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/iconv.m4 \ @@ -78,54 +98,58 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inline.m4 \ $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax_t.m4 \ $(top_srcdir)/m4/inttostr.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ - $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h_gl.m4 \ + $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ $(top_srcdir)/m4/iswblank.m4 $(top_srcdir)/m4/langinfo_h.m4 \ - $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld_gl.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix_gl.m4 \ + $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ $(top_srcdir)/m4/libsigsegv.m4 \ $(top_srcdir)/m4/libunistring-base.m4 \ $(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \ $(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \ $(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \ - $(top_srcdir)/m4/longlong_gl.m4 $(top_srcdir)/m4/lstat.m4 \ - $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ - $(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbchar.m4 \ - $(top_srcdir)/m4/mbiter.m4 $(top_srcdir)/m4/mbrtowc.m4 \ - $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbslen.m4 \ - $(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \ - $(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mktime.m4 \ - $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ - $(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/nl_langinfo.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/nocrash.m4 \ - $(top_srcdir)/m4/onceonly.m4 $(top_srcdir)/m4/open.m4 \ - $(top_srcdir)/m4/po_gl.m4 $(top_srcdir)/m4/printf.m4 \ + $(top_srcdir)/m4/localeconv.m4 $(top_srcdir)/m4/longlong.m4 \ + $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/malloc.m4 \ + $(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \ + $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ + $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \ + $(top_srcdir)/m4/mbslen.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \ + $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \ + $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mkstemp.m4 \ + $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/mmap-anon.m4 \ + $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \ + $(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \ + $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/off_t.m4 \ + $(top_srcdir)/m4/open.m4 $(top_srcdir)/m4/pathmax.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf.m4 \ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/putenv.m4 \ $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ - $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/setenv.m4 \ - $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/sigaction.m4 \ - $(top_srcdir)/m4/signal_h.m4 \ + $(top_srcdir)/m4/raise.m4 $(top_srcdir)/m4/readlink.m4 \ + $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/secure_getenv.m4 \ + $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/setlocale.m4 \ + $(top_srcdir)/m4/sigaction.m4 $(top_srcdir)/m4/signal_h.m4 \ $(top_srcdir)/m4/signalblocking.m4 \ $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/sleep.m4 \ $(top_srcdir)/m4/snprintf.m4 $(top_srcdir)/m4/ssize_t.m4 \ $(top_srcdir)/m4/stat-time.m4 $(top_srcdir)/m4/stat.m4 \ $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.m4 \ $(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \ - $(top_srcdir)/m4/stdint_h_gl.m4 $(top_srcdir)/m4/stdio_h.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio_h.m4 \ $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/strcase.m4 \ - $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/strerror_r.m4 \ - $(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/string_h.m4 \ - $(top_srcdir)/m4/strings_h.m4 $(top_srcdir)/m4/strndup.m4 \ - $(top_srcdir)/m4/strnlen.m4 $(top_srcdir)/m4/strptime.m4 \ - $(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \ - $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/sys_socket_h.m4 \ + $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/strftime.m4 \ + $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strings_h.m4 \ + $(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \ + $(top_srcdir)/m4/strptime.m4 $(top_srcdir)/m4/strtoull.m4 \ + $(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/symlink.m4 \ + $(top_srcdir)/m4/sys_socket_h.m4 \ $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ - $(top_srcdir)/m4/sys_wait_h.m4 $(top_srcdir)/m4/tempname.m4 \ - $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \ - $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \ - $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlocked-io.m4 \ - $(top_srcdir)/m4/usleep.m4 $(top_srcdir)/m4/vararrays.m4 \ - $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/version-etc.m4 \ + $(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/sys_wait_h.m4 \ + $(top_srcdir)/m4/tempname.m4 $(top_srcdir)/m4/time_h.m4 \ + $(top_srcdir)/m4/time_r.m4 $(top_srcdir)/m4/timespec.m4 \ + $(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/unistd_h.m4 \ + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/usleep.m4 \ + $(top_srcdir)/m4/vararrays.m4 $(top_srcdir)/m4/vasnprintf.m4 \ + $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/version-etc.m4 \ $(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/warnings.m4 \ $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctob.m4 \ @@ -133,42 +157,55 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/wcwidth.m4 $(top_srcdir)/m4/wint_t.m4 \ $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xsize.m4 \ $(top_srcdir)/m4/xstrndup.m4 $(top_srcdir)/m4/xstrtol.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/xvasprintf.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/lib/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -AM_V_DVIPS = $(am__v_DVIPS_$(V)) -am__v_DVIPS_ = $(am__v_DVIPS_$(AM_DEFAULT_VERBOSITY)) +AM_V_DVIPS = $(am__v_DVIPS_@AM_V@) +am__v_DVIPS_ = $(am__v_DVIPS_@AM_DEFAULT_V@) am__v_DVIPS_0 = @echo " DVIPS " $@; -AM_V_MAKEINFO = $(am__v_MAKEINFO_$(V)) -am__v_MAKEINFO_ = $(am__v_MAKEINFO_$(AM_DEFAULT_VERBOSITY)) +am__v_DVIPS_1 = +AM_V_MAKEINFO = $(am__v_MAKEINFO_@AM_V@) +am__v_MAKEINFO_ = $(am__v_MAKEINFO_@AM_DEFAULT_V@) am__v_MAKEINFO_0 = @echo " MAKEINFO" $@; -AM_V_INFOHTML = $(am__v_INFOHTML_$(V)) -am__v_INFOHTML_ = $(am__v_INFOHTML_$(AM_DEFAULT_VERBOSITY)) +am__v_MAKEINFO_1 = +AM_V_INFOHTML = $(am__v_INFOHTML_@AM_V@) +am__v_INFOHTML_ = $(am__v_INFOHTML_@AM_DEFAULT_V@) am__v_INFOHTML_0 = @echo " INFOHTML" $@; -AM_V_TEXI2DVI = $(am__v_TEXI2DVI_$(V)) -am__v_TEXI2DVI_ = $(am__v_TEXI2DVI_$(AM_DEFAULT_VERBOSITY)) +am__v_INFOHTML_1 = +AM_V_TEXI2DVI = $(am__v_TEXI2DVI_@AM_V@) +am__v_TEXI2DVI_ = $(am__v_TEXI2DVI_@AM_DEFAULT_V@) am__v_TEXI2DVI_0 = @echo " TEXI2DVI" $@; -AM_V_TEXI2PDF = $(am__v_TEXI2PDF_$(V)) -am__v_TEXI2PDF_ = $(am__v_TEXI2PDF_$(AM_DEFAULT_VERBOSITY)) +am__v_TEXI2DVI_1 = +AM_V_TEXI2PDF = $(am__v_TEXI2PDF_@AM_V@) +am__v_TEXI2PDF_ = $(am__v_TEXI2PDF_@AM_DEFAULT_V@) am__v_TEXI2PDF_0 = @echo " TEXI2PDF" $@; -AM_V_texinfo = $(am__v_texinfo_$(V)) -am__v_texinfo_ = $(am__v_texinfo_$(AM_DEFAULT_VERBOSITY)) +am__v_TEXI2PDF_1 = +AM_V_texinfo = $(am__v_texinfo_@AM_V@) +am__v_texinfo_ = $(am__v_texinfo_@AM_DEFAULT_V@) am__v_texinfo_0 = -q -AM_V_texidevnull = $(am__v_texidevnull_$(V)) -am__v_texidevnull_ = $(am__v_texidevnull_$(AM_DEFAULT_VERBOSITY)) +am__v_texinfo_1 = +AM_V_texidevnull = $(am__v_texidevnull_@AM_V@) +am__v_texidevnull_ = $(am__v_texidevnull_@AM_DEFAULT_V@) am__v_texidevnull_0 = > /dev/null +am__v_texidevnull_1 = INFO_DEPS = $(srcdir)/diffutils.info TEXINFO_TEX = $(top_srcdir)/build-aux/texinfo.tex am__TEXINFO_TEX_DIR = $(top_srcdir)/build-aux @@ -182,6 +219,11 @@ TEXI2PDF = $(TEXI2DVI) --pdf --batch MAKEINFOHTML = $(MAKEINFO) --html AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS) DVIPS = dvips +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__installdirs = "$(DESTDIR)$(infodir)" am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -204,6 +246,13 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ @@ -255,9 +304,11 @@ GNULIB_ATOLL = @GNULIB_ATOLL@ GNULIB_BTOWC = @GNULIB_BTOWC@ GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@ GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@ +GNULIB_CHDIR = @GNULIB_CHDIR@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ GNULIB_DPRINTF = @GNULIB_DPRINTF@ +GNULIB_DUP = @GNULIB_DUP@ GNULIB_DUP2 = @GNULIB_DUP2@ GNULIB_DUP3 = @GNULIB_DUP3@ GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@ @@ -269,6 +320,8 @@ GNULIB_FCHMODAT = @GNULIB_FCHMODAT@ GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@ GNULIB_FCLOSE = @GNULIB_FCLOSE@ GNULIB_FCNTL = @GNULIB_FCNTL@ +GNULIB_FDATASYNC = @GNULIB_FDATASYNC@ +GNULIB_FDOPEN = @GNULIB_FDOPEN@ GNULIB_FFLUSH = @GNULIB_FFLUSH@ GNULIB_FFS = @GNULIB_FFS@ GNULIB_FFSL = @GNULIB_FFSL@ @@ -286,6 +339,7 @@ GNULIB_FREOPEN = @GNULIB_FREOPEN@ GNULIB_FSCANF = @GNULIB_FSCANF@ GNULIB_FSEEK = @GNULIB_FSEEK@ GNULIB_FSEEKO = @GNULIB_FSEEKO@ +GNULIB_FSTAT = @GNULIB_FSTAT@ GNULIB_FSTATAT = @GNULIB_FSTATAT@ GNULIB_FSYNC = @GNULIB_FSYNC@ GNULIB_FTELL = @GNULIB_FTELL@ @@ -306,21 +360,23 @@ GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@ GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ -GNULIB_GETS = @GNULIB_GETS@ GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ +GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@ GNULIB_GRANTPT = @GNULIB_GRANTPT@ GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@ GNULIB_ICONV = @GNULIB_ICONV@ GNULIB_IMAXABS = @GNULIB_IMAXABS@ GNULIB_IMAXDIV = @GNULIB_IMAXDIV@ +GNULIB_ISATTY = @GNULIB_ISATTY@ GNULIB_ISWBLANK = @GNULIB_ISWBLANK@ GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@ GNULIB_LCHMOD = @GNULIB_LCHMOD@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LINK = @GNULIB_LINK@ GNULIB_LINKAT = @GNULIB_LINKAT@ +GNULIB_LOCALECONV = @GNULIB_LOCALECONV@ GNULIB_LSEEK = @GNULIB_LSEEK@ GNULIB_LSTAT = @GNULIB_LSTAT@ GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ @@ -366,20 +422,25 @@ GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@ GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ GNULIB_OPEN = @GNULIB_OPEN@ GNULIB_OPENAT = @GNULIB_OPENAT@ +GNULIB_PCLOSE = @GNULIB_PCLOSE@ GNULIB_PERROR = @GNULIB_PERROR@ GNULIB_PIPE = @GNULIB_PIPE@ GNULIB_PIPE2 = @GNULIB_PIPE2@ GNULIB_POPEN = @GNULIB_POPEN@ +GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@ GNULIB_PREAD = @GNULIB_PREAD@ GNULIB_PRINTF = @GNULIB_PRINTF@ GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@ GNULIB_PTHREAD_SIGMASK = @GNULIB_PTHREAD_SIGMASK@ GNULIB_PTSNAME = @GNULIB_PTSNAME@ +GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@ GNULIB_PUTC = @GNULIB_PUTC@ GNULIB_PUTCHAR = @GNULIB_PUTCHAR@ GNULIB_PUTENV = @GNULIB_PUTENV@ GNULIB_PUTS = @GNULIB_PUTS@ GNULIB_PWRITE = @GNULIB_PWRITE@ +GNULIB_RAISE = @GNULIB_RAISE@ +GNULIB_RANDOM = @GNULIB_RANDOM@ GNULIB_RANDOM_R = @GNULIB_RANDOM_R@ GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READ = @GNULIB_READ@ @@ -393,7 +454,9 @@ GNULIB_RENAMEAT = @GNULIB_RENAMEAT@ GNULIB_RMDIR = @GNULIB_RMDIR@ GNULIB_RPMATCH = @GNULIB_RPMATCH@ GNULIB_SCANF = @GNULIB_SCANF@ +GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@ GNULIB_SETENV = @GNULIB_SETENV@ +GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@ GNULIB_SETLOCALE = @GNULIB_SETLOCALE@ GNULIB_SIGACTION = @GNULIB_SIGACTION@ GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@ @@ -434,7 +497,6 @@ GNULIB_TIME_R = @GNULIB_TIME_R@ GNULIB_TMPFILE = @GNULIB_TMPFILE@ GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@ GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ -GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@ GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNLINK = @GNULIB_UNLINK@ @@ -500,6 +562,7 @@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ +HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@ HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@ HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@ @@ -517,6 +580,7 @@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ +HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@ HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ @@ -542,6 +606,7 @@ HAVE_FCHDIR = @HAVE_FCHDIR@ HAVE_FCHMODAT = @HAVE_FCHMODAT@ HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ HAVE_FCNTL = @HAVE_FCNTL@ +HAVE_FDATASYNC = @HAVE_FDATASYNC@ HAVE_FEATURES_H = @HAVE_FEATURES_H@ HAVE_FFS = @HAVE_FFS@ HAVE_FFSL = @HAVE_FFSL@ @@ -595,17 +660,24 @@ HAVE_MKOSTEMP = @HAVE_MKOSTEMP@ HAVE_MKOSTEMPS = @HAVE_MKOSTEMPS@ HAVE_MKSTEMP = @HAVE_MKSTEMP@ HAVE_MKSTEMPS = @HAVE_MKSTEMPS@ +HAVE_MSVC_INVALID_PARAMETER_HANDLER = @HAVE_MSVC_INVALID_PARAMETER_HANDLER@ HAVE_NANOSLEEP = @HAVE_NANOSLEEP@ HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@ HAVE_OPENAT = @HAVE_OPENAT@ HAVE_OS_H = @HAVE_OS_H@ +HAVE_PCLOSE = @HAVE_PCLOSE@ HAVE_PIPE = @HAVE_PIPE@ HAVE_PIPE2 = @HAVE_PIPE2@ +HAVE_POPEN = @HAVE_POPEN@ +HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@ HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@ HAVE_PREAD = @HAVE_PREAD@ HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@ HAVE_PTSNAME = @HAVE_PTSNAME@ +HAVE_PTSNAME_R = @HAVE_PTSNAME_R@ HAVE_PWRITE = @HAVE_PWRITE@ +HAVE_RAISE = @HAVE_RAISE@ +HAVE_RANDOM = @HAVE_RANDOM@ HAVE_RANDOM_H = @HAVE_RANDOM_H@ HAVE_RANDOM_R = @HAVE_RANDOM_R@ HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ @@ -614,7 +686,9 @@ HAVE_READLINKAT = @HAVE_READLINKAT@ HAVE_REALPATH = @HAVE_REALPATH@ HAVE_RENAMEAT = @HAVE_RENAMEAT@ HAVE_RPMATCH = @HAVE_RPMATCH@ +HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@ HAVE_SETENV = @HAVE_SETENV@ +HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@ HAVE_SIGACTION = @HAVE_SIGACTION@ HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@ HAVE_SIGINFO_T = @HAVE_SIGINFO_T@ @@ -629,6 +703,7 @@ HAVE_STPNCPY = @HAVE_STPNCPY@ HAVE_STRCASECMP = @HAVE_STRCASECMP@ HAVE_STRCASESTR = @HAVE_STRCASESTR@ HAVE_STRCHRNUL = @HAVE_STRCHRNUL@ +HAVE_STRINGS_H = @HAVE_STRINGS_H@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRPTIME = @HAVE_STRPTIME@ HAVE_STRSEP = @HAVE_STRSEP@ @@ -761,6 +836,7 @@ NEXT_AS_FIRST_DIRECTIVE_STRINGS_H = @NEXT_AS_FIRST_DIRECTIVE_STRINGS_H@ NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@ +NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ @@ -784,6 +860,7 @@ NEXT_STRINGS_H = @NEXT_STRINGS_H@ NEXT_STRING_H = @NEXT_STRING_H@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ +NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ NEXT_SYS_WAIT_H = @NEXT_SYS_WAIT_H@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ @@ -819,6 +896,7 @@ REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ +REPLACE_FDOPEN = @REPLACE_FDOPEN@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ REPLACE_FOPEN = @REPLACE_FOPEN@ REPLACE_FPRINTF = @REPLACE_FPRINTF@ @@ -830,6 +908,7 @@ REPLACE_FSTAT = @REPLACE_FSTAT@ REPLACE_FSTATAT = @REPLACE_FSTATAT@ REPLACE_FTELL = @REPLACE_FTELL@ REPLACE_FTELLO = @REPLACE_FTELLO@ +REPLACE_FTRUNCATE = @REPLACE_FTRUNCATE@ REPLACE_FUTIMENS = @REPLACE_FUTIMENS@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETDELIM = @REPLACE_GETDELIM@ @@ -842,11 +921,14 @@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_ICONV = @REPLACE_ICONV@ REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@ REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@ +REPLACE_ISATTY = @REPLACE_ISATTY@ REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ +REPLACE_ITOLD = @REPLACE_ITOLD@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LINK = @REPLACE_LINK@ REPLACE_LINKAT = @REPLACE_LINKAT@ +REPLACE_LOCALECONV = @REPLACE_LOCALECONV@ REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@ REPLACE_LSEEK = @REPLACE_LSEEK@ REPLACE_LSTAT = @REPLACE_LSTAT@ @@ -876,8 +958,12 @@ REPLACE_POPEN = @REPLACE_POPEN@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PTHREAD_SIGMASK = @REPLACE_PTHREAD_SIGMASK@ +REPLACE_PTSNAME = @REPLACE_PTSNAME@ +REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@ REPLACE_PUTENV = @REPLACE_PUTENV@ REPLACE_PWRITE = @REPLACE_PWRITE@ +REPLACE_RAISE = @REPLACE_RAISE@ +REPLACE_RANDOM_R = @REPLACE_RANDOM_R@ REPLACE_READ = @REPLACE_READ@ REPLACE_READLINK = @REPLACE_READLINK@ REPLACE_REALLOC = @REPLACE_REALLOC@ @@ -906,7 +992,10 @@ REPLACE_STRNLEN = @REPLACE_STRNLEN@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ REPLACE_STRSTR = @REPLACE_STRSTR@ REPLACE_STRTOD = @REPLACE_STRTOD@ +REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@ REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ +REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@ +REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ @@ -953,6 +1042,8 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ WERROR_CFLAGS = @WERROR_CFLAGS@ +WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ +WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@ WINT_T_SUFFIX = @WINT_T_SUFFIX@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ @@ -964,7 +1055,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ am__include = @am__include@ -am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ @@ -1000,7 +1090,6 @@ lispdir = @lispdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ -mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ prefix = @prefix@ @@ -1054,49 +1143,31 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): .texi.info: - $(AM_V_MAKEINFO)restore=: && backupdir="$(am__leading_dot)am$$$$" && \ - am__cwd=`pwd` && $(am__cd) $(srcdir) && \ - rm -rf $$backupdir && mkdir $$backupdir && \ - if ($(MAKEINFO) --version) >/dev/null 2>&1; then \ - for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \ - if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \ - done; \ - else :; fi && \ - cd "$$am__cwd"; \ - if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ - -o $@ $<; \ - then \ - rc=0; \ - $(am__cd) $(srcdir); \ - else \ - rc=$$?; \ - $(am__cd) $(srcdir) && \ - $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \ - fi; \ - rm -rf $$backupdir; exit $$rc + $(AM_V_MAKEINFO)$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \ + -I $(srcdir) --no-split -o $@-t \ + $< + $(AM_V_at)mv -f $@-t $@ .texi.dvi: $(AM_V_TEXI2DVI)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ - $(TEXI2DVI) $(AM_V_texinfo) $< $(AM_V_texidevnull) + $(TEXI2DVI) $(AM_V_texinfo) --build-dir=$(@:.dvi=.t2d) -o $@ $(AM_V_texidevnull) \ + $< .texi.pdf: $(AM_V_TEXI2PDF)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ - $(TEXI2PDF) $(AM_V_texinfo) $< $(AM_V_texidevnull) + $(TEXI2PDF) $(AM_V_texinfo) --build-dir=$(@:.pdf=.t2p) -o $@ $(AM_V_texidevnull) \ + $< .texi.html: $(AM_V_MAKEINFO)rm -rf $(@:.html=.htp) $(AM_V_at)if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ -o $(@:.html=.htp) $<; \ then \ - rm -rf $@; \ - if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \ - mv $(@:.html=) $@; else mv $(@:.html=.htp) $@; fi; \ + rm -rf $@ && mv $(@:.html=.htp) $@; \ else \ - if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \ - rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \ - exit 1; \ + rm -rf $(@:.html=.htp); exit 1; \ fi $(srcdir)/diffutils.info: diffutils.texi $(srcdir)/version.texi $(diffutils_TEXINFOS) diffutils.dvi: diffutils.texi $(srcdir)/version.texi $(diffutils_TEXINFOS) @@ -1145,9 +1216,7 @@ uninstall-html-am: uninstall-info-am: @$(PRE_UNINSTALL) - @if test -d '$(DESTDIR)$(infodir)' && \ - (install-info --version && \ - install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \ + @if test -d '$(DESTDIR)$(infodir)' && $(am__can_run_installinfo); then \ list='$(INFO_DEPS)'; \ for file in $$list; do \ relfile=`echo "$$file" | sed 's|^.*/||'`; \ @@ -1160,10 +1229,9 @@ uninstall-info-am: @list='$(INFO_DEPS)'; \ for file in $$list; do \ relfile=`echo "$$file" | sed 's|^.*/||'`; \ - relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \ (if test -d "$(DESTDIR)$(infodir)" && cd "$(DESTDIR)$(infodir)"; then \ - echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]"; \ - rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \ + echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile"; \ + rm -f $$relfile; \ else :; fi); \ done @@ -1192,38 +1260,28 @@ dist-info: $(INFO_DEPS) case $$base in \ $(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \ esac; \ - if test -f $$base; then d=.; else d=$(srcdir); fi; \ - base_i=`echo "$$base" | sed 's|\.info$$||;s|$$|.i|'`; \ - for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9] $$d/$$base_i[0-9] $$d/$$base_i[0-9][0-9]; do \ - if test -f $$file; then \ - relfile=`expr "$$file" : "$$d/\(.*\)"`; \ - test -f "$(distdir)/$$relfile" || \ - cp -p $$file "$(distdir)/$$relfile"; \ - else :; fi; \ - done; \ + if test -f $$base; then \ + file=./$$base; \ + else \ + file=$(srcdir)/$$base; \ + fi; \ + if test -f $$file && test ! -f "$(distdir)/$$base"; then \ + cp -p $$file "$(distdir)/$$base"; \ + fi; \ done mostlyclean-aminfo: - -rm -rf diffutils.aux diffutils.cp diffutils.cps diffutils.fn diffutils.fns \ - diffutils.ky diffutils.kys diffutils.log diffutils.pg \ - diffutils.pgs diffutils.tmp diffutils.toc diffutils.tp \ - diffutils.tps diffutils.vr + -rm -rf diffutils.t2d diffutils.t2p clean-aminfo: -test -z "diffutils.dvi diffutils.pdf diffutils.ps diffutils.html" \ || rm -rf diffutils.dvi diffutils.pdf diffutils.ps diffutils.html maintainer-clean-aminfo: - @list='$(INFO_DEPS)'; for i in $$list; do \ - i_i=`echo "$$i" | sed 's|\.info$$||;s|$$|.i|'`; \ - echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]"; \ - rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \ - done -tags: TAGS -TAGS: + -test -z "$(INFO_DEPS)" || rm -f $(INFO_DEPS) +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -1324,8 +1382,11 @@ install-dvi: install-dvi-am install-dvi-am: $(DVIS) @$(NORMAL_INSTALL) - test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)" @list='$(DVIS)'; test -n "$(dvidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(dvidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(dvidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -1340,18 +1401,22 @@ install-html: install-html-am install-html-am: $(HTMLS) @$(NORMAL_INSTALL) - test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)" @list='$(HTMLS)'; list2=; test -n "$(htmldir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \ $(am__strip_dir) \ - if test -d "$$d$$p"; then \ + d2=$$d$$p; \ + if test -d "$$d2"; then \ echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \ $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \ - echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \ - $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \ + echo " $(INSTALL_DATA) '$$d2'/* '$(DESTDIR)$(htmldir)/$$f'"; \ + $(INSTALL_DATA) "$$d2"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \ else \ - list2="$$list2 $$d$$p"; \ + list2="$$list2 $$d2"; \ fi; \ done; \ test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \ @@ -1363,28 +1428,27 @@ install-info: install-info-am install-info-am: $(INFO_DEPS) @$(NORMAL_INSTALL) - test -z "$(infodir)" || $(MKDIR_P) "$(DESTDIR)$(infodir)" @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(infodir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(infodir)" || exit 1; \ + fi; \ for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ esac; \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ - file_i=`echo "$$file" | sed 's|\.info$$||;s|$$|.i|'`; \ - for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \ - $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \ - if test -f $$ifile; then \ - echo "$$ifile"; \ - else : ; fi; \ - done; \ + if test -f $$file; then \ + echo ./$$file; \ + else \ + echo $(srcdir)/$$file; \ + fi; \ done | $(am__base_list) | \ while read files; do \ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \ $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done @$(POST_INSTALL) - @if (install-info --version && \ - install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \ + @if $(am__can_run_installinfo); then \ list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \ for file in $$list; do \ relfile=`echo "$$file" | sed 's|^.*/||'`; \ @@ -1398,8 +1462,11 @@ install-pdf: install-pdf-am install-pdf-am: $(PDFS) @$(NORMAL_INSTALL) - test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)" @list='$(PDFS)'; test -n "$(pdfdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pdfdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pdfdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -1411,8 +1478,11 @@ install-ps: install-ps-am install-ps-am: $(PSS) @$(NORMAL_INSTALL) - test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)" @list='$(PSS)'; test -n "$(psdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(psdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(psdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -1445,18 +1515,19 @@ uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-aminfo clean-generic \ - dist-info distclean distclean-generic distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-aminfo maintainer-clean-generic \ - maintainer-clean-vti mostlyclean mostlyclean-aminfo \ - mostlyclean-generic mostlyclean-vti pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-dvi-am uninstall-html-am \ - uninstall-info-am uninstall-pdf-am uninstall-ps-am + cscopelist-am ctags-am dist-info distclean distclean-generic \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-aminfo \ + maintainer-clean-generic maintainer-clean-vti mostlyclean \ + mostlyclean-aminfo mostlyclean-generic mostlyclean-vti pdf \ + pdf-am ps ps-am tags-am uninstall uninstall-am \ + uninstall-dvi-am uninstall-html-am uninstall-info-am \ + uninstall-pdf-am uninstall-ps-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/doc/diagmeet.note b/doc/diagmeet.note index 9ffd175..2d30d21 100644 --- a/doc/diagmeet.note +++ b/doc/diagmeet.note @@ -1,5 +1,5 @@ Here is a comparison matrix which shows a case in which -it is possible for the forward and backward scan in `diag' +it is possible for the forward and backward scan in 'diag' to meet along a nonzero length of diagonal simultaneous (so that bdiag[d] and fdiag[d] are not equal) even though there is no snake on that diagonal at the meeting point. diff --git a/doc/diffutils.info b/doc/diffutils.info index b44d1cf..42ee687 100644 --- a/doc/diffutils.info +++ b/doc/diffutils.info @@ -1,12 +1,12 @@ -This is diffutils.info, produced by makeinfo version 4.13 from +This is diffutils.info-t, produced by makeinfo version 4.13 from diffutils.texi. -This manual is for GNU Diffutils (version 3.2, 15 August 2011), and +This manual is for GNU Diffutils (version 3.3, 23 March 2013), and documents the GNU `diff', `diff3', `sdiff', and `cmp' commands for showing the differences between files and the GNU `patch' command for using their output to update files. - Copyright (C) 1992-1994, 1998, 2001-2002, 2004, 2006, 2009-2011 Free + Copyright (C) 1992-1994, 1998, 2001-2002, 2004, 2006, 2009-2013 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this @@ -31,17 +31,17 @@ START-INFO-DIR-ENTRY END-INFO-DIR-ENTRY -File: diffutils.info, Node: Top, Next: Overview, Up: (dir) +File: diffutils.info-t, Node: Top, Next: Overview, Up: (dir) Comparing and Merging Files *************************** -This manual is for GNU Diffutils (version 3.2, 15 August 2011), and +This manual is for GNU Diffutils (version 3.3, 23 March 2013), and documents the GNU `diff', `diff3', `sdiff', and `cmp' commands for showing the differences between files and the GNU `patch' command for using their output to update files. - Copyright (C) 1992-1994, 1998, 2001-2002, 2004, 2006, 2009-2011 Free + Copyright (C) 1992-1994, 1998, 2001-2002, 2004, 2006, 2009-2013 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this @@ -84,7 +84,7 @@ Software Foundation, Inc. * Index:: Index. -File: diffutils.info, Node: Overview, Next: Comparison, Prev: Top, Up: Top +File: diffutils.info-t, Node: Overview, Next: Comparison, Prev: Top, Up: Top Overview ******** @@ -155,7 +155,7 @@ MacKenzie. Parts of this manual are adapted from a manual page written by Larry Wall, with his permission. -File: diffutils.info, Node: Comparison, Next: Output Formats, Prev: Overview, Up: Top +File: diffutils.info-t, Node: Comparison, Next: Output Formats, Prev: Overview, Up: Top 1 What Comparison Means *********************** @@ -208,7 +208,7 @@ changes to the same file. * Binary:: Comparing binary files or forcing text comparisons. -File: diffutils.info, Node: Hunks, Next: White Space, Up: Comparison +File: diffutils.info-t, Node: Hunks, Next: White Space, Up: Comparison 1.1 Hunks ========= @@ -254,7 +254,7 @@ possible. You can adjust this tradeoff with the `--minimal' (`-d') option (*note diff Performance::). -File: diffutils.info, Node: White Space, Next: Blank Lines, Prev: Hunks, Up: Comparison +File: diffutils.info-t, Node: White Space, Next: Blank Lines, Prev: Hunks, Up: Comparison 1.2 Suppressing Differences in Blank and Tab Spacing ==================================================== @@ -292,7 +292,7 @@ line. Hence the `-w' or `--ignore-all-space' option does not ignore newline-related changes; it ignores only other white space changes. -File: diffutils.info, Node: Blank Lines, Next: Specified Lines, Prev: White Space, Up: Comparison +File: diffutils.info-t, Node: Blank Lines, Next: Specified Lines, Prev: White Space, Up: Comparison 1.3 Suppressing Differences Whose Lines Are All Blank ===================================================== @@ -318,7 +318,7 @@ words, `-B' is equivalent to `-I '^$'' by default, but it is equivalent to `-I '^[[:space:]]*$'' if `-b', `-w' or `-Z' is also specified. -File: diffutils.info, Node: Specified Lines, Next: Case Folding, Prev: Blank Lines, Up: Comparison +File: diffutils.info-t, Node: Specified Lines, Next: Case Folding, Prev: Blank Lines, Up: Comparison 1.4 Suppressing Differences Whose Lines All Match a Regular Expression ====================================================================== @@ -341,7 +341,7 @@ by using more than one `-I' option. `diff' tries to match each line against each regular expression. -File: diffutils.info, Node: Case Folding, Next: Brief, Prev: Specified Lines, Up: Comparison +File: diffutils.info-t, Node: Case Folding, Next: Brief, Prev: Specified Lines, Up: Comparison 1.5 Suppressing Case Differences ================================ @@ -352,7 +352,7 @@ case counterparts, so that, for example, it considers `Funky Stuff', use the `-i' or `--ignore-case' option. -File: diffutils.info, Node: Brief, Next: Binary, Prev: Case Folding, Up: Comparison +File: diffutils.info-t, Node: Brief, Next: Binary, Prev: Case Folding, Up: Comparison 1.6 Summarizing Which Files Differ ================================== @@ -381,7 +381,7 @@ Invoking cmp::). two files. -File: diffutils.info, Node: Binary, Prev: Brief, Up: Comparison +File: diffutils.info-t, Node: Binary, Prev: Brief, Up: Comparison 1.7 Binary Files and Forcing Text Comparisons ============================================= @@ -455,7 +455,7 @@ few non-text bytes but otherwise are like text files, you can force line by using the `-a' or `--text' option. -File: diffutils.info, Node: Output Formats, Next: Incomplete Lines, Prev: Comparison, Up: Top +File: diffutils.info-t, Node: Output Formats, Next: Incomplete Lines, Prev: Comparison, Up: Top 2 `diff' Output Formats *********************** @@ -474,7 +474,7 @@ reports the differences between two sample input files. * If-then-else:: Merging files with if-then-else. -File: diffutils.info, Node: Sample diff Input, Next: Context, Up: Output Formats +File: diffutils.info-t, Node: Sample diff Input, Next: Context, Up: Output Formats 2.1 Two Sample Input Files ========================== @@ -518,7 +518,7 @@ second and third lines of `tzu', and the last hunk contains just the last three lines of `tzu'. -File: diffutils.info, Node: Context, Next: Side by Side, Prev: Sample diff Input, Up: Output Formats +File: diffutils.info-t, Node: Context, Next: Side by Side, Prev: Sample diff Input, Up: Output Formats 2.2 Showing Differences in Their Context ======================================== @@ -551,7 +551,7 @@ more information on using `patch' to apply imperfect diffs. * Alternate Names:: Showing alternate file names in context headers. -File: diffutils.info, Node: Context Format, Next: Unified Format, Up: Context +File: diffutils.info-t, Node: Context Format, Next: Unified Format, Up: Context 2.2.1 Context Format -------------------- @@ -573,7 +573,7 @@ needs at least two lines of context. * Detailed Context:: A detailed description of the context output format. -File: diffutils.info, Node: Example Context, Next: Less Context, Up: Context Format +File: diffutils.info-t, Node: Example Context, Next: Less Context, Up: Context Format 2.2.1.1 An Example of Context Format .................................... @@ -613,7 +613,7 @@ run together, because their contents overlap. + The door of all subtleties! -File: diffutils.info, Node: Less Context, Next: Detailed Context, Prev: Example Context, Up: Context Format +File: diffutils.info-t, Node: Less Context, Next: Detailed Context, Prev: Example Context, Up: Context Format 2.2.1.2 An Example of Context Format with Less Context ...................................................... @@ -645,7 +645,7 @@ context line is reported here. + The door of all subtleties! -File: diffutils.info, Node: Detailed Context, Prev: Less Context, Up: Context Format +File: diffutils.info-t, Node: Detailed Context, Prev: Less Context, Up: Context Format 2.2.1.3 Detailed Description of Context Format .............................................. @@ -705,7 +705,7 @@ FROM-FILE are omitted. If all of the changes are deletions, the lines of TO-FILE are omitted. -File: diffutils.info, Node: Unified Format, Next: Sections, Prev: Context Format, Up: Context +File: diffutils.info-t, Node: Unified Format, Next: Sections, Prev: Context Format, Up: Context 2.2.2 Unified Format -------------------- @@ -726,7 +726,7 @@ operation, `patch' typically needs at least three lines of context. * Detailed Unified:: A detailed description of unified format. -File: diffutils.info, Node: Example Unified, Next: Detailed Unified, Up: Unified Format +File: diffutils.info-t, Node: Example Unified, Next: Detailed Unified, Up: Unified Format 2.2.2.1 An Example of Unified Format .................................... @@ -755,7 +755,7 @@ Input::, for the complete contents of the two files): +The door of all subtleties! -File: diffutils.info, Node: Detailed Unified, Prev: Example Unified, Up: Unified Format +File: diffutils.info-t, Node: Detailed Unified, Prev: Example Unified, Up: Unified Format 2.2.2.2 Detailed Description of Unified Format .............................................. @@ -771,8 +771,8 @@ indicate the date, time with fractional seconds, and time zone. The fractional seconds are omitted on hosts that do not support fractional time stamps. - You can change the header's content with the `--label=LABEL' option; -see *Note Alternate Names::. + You can change the header's content with the `--label=LABEL' option. +*Note Alternate Names::. Next come one or more hunks of differences; each hunk shows one area where the files differ. Unified format hunks look like this: @@ -801,7 +801,7 @@ following indicator characters in the left print column: A line was removed here from the first file. -File: diffutils.info, Node: Sections, Next: Alternate Names, Prev: Unified Format, Up: Context +File: diffutils.info-t, Node: Sections, Next: Alternate Names, Prev: Unified Format, Up: Context 2.2.3 Showing Which Sections Differences Are in ----------------------------------------------- @@ -819,7 +819,7 @@ lines are "section headings" is determined by a regular expression. * C Function Headings:: Showing headings of C functions. -File: diffutils.info, Node: Specified Headings, Next: C Function Headings, Up: Sections +File: diffutils.info-t, Node: Specified Headings, Next: C Function Headings, Up: Sections 2.2.3.1 Showing Lines That Match Regular Expressions .................................................... @@ -857,7 +857,7 @@ regular expression, starting with the last one given. This means that you can use `-p' and `-F' together, if you wish. -File: diffutils.info, Node: C Function Headings, Prev: Specified Headings, Up: Sections +File: diffutils.info-t, Node: C Function Headings, Prev: Specified Headings, Up: Sections 2.2.3.2 Showing C Function Headings ................................... @@ -876,7 +876,7 @@ elsewhere in the command line. this option for the sake of convenience. -File: diffutils.info, Node: Alternate Names, Prev: Sections, Up: Context +File: diffutils.info-t, Node: Alternate Names, Prev: Sections, Up: Context 2.2.4 Showing Alternate File Names ---------------------------------- @@ -899,7 +899,7 @@ Pagination::). --- modified -File: diffutils.info, Node: Side by Side, Next: Normal, Prev: Context, Up: Output Formats +File: diffutils.info-t, Node: Side by Side, Next: Normal, Prev: Context, Up: Output Formats 2.3 Showing Differences Side by Side ==================================== @@ -940,7 +940,7 @@ white space incomplete. Normally, an output line is incomplete if and only if the lines that -it contains are incomplete; *Note Incomplete Lines::. However, when an +it contains are incomplete. *Note Incomplete Lines::. However, when an output line represents two differing lines, one might be incomplete while the other is not. In this case, the output line is complete, but its the gutter is marked `\' if the first line is incomplete, `/' if @@ -963,7 +963,7 @@ merging files. * Example Side by Side:: Sample side by side output. -File: diffutils.info, Node: Side by Side Format, Next: Example Side by Side, Up: Side by Side +File: diffutils.info-t, Node: Side by Side Format, Next: Example Side by Side, Up: Side by Side 2.3.1 Controlling Side by Side Format ------------------------------------- @@ -983,7 +983,7 @@ lines. The `--suppress-common-lines' option suppresses common lines entirely. -File: diffutils.info, Node: Example Side by Side, Prev: Side by Side Format, Up: Side by Side +File: diffutils.info-t, Node: Example Side by Side, Prev: Side by Side Format, Up: Side by Side 2.3.2 An Example of Side by Side Format --------------------------------------- @@ -1008,7 +1008,7 @@ diff Input::, for the complete contents of the two files). > The door of all subtleties! -File: diffutils.info, Node: Normal, Next: Scripts, Prev: Side by Side, Up: Output Formats +File: diffutils.info-t, Node: Normal, Next: Scripts, Prev: Side by Side, Up: Output Formats 2.4 Showing Differences Without Context ======================================= @@ -1030,7 +1030,7 @@ Use the `--normal' option to select this output format explicitly. * Detailed Normal:: A detailed description of normal output format. -File: diffutils.info, Node: Example Normal, Next: Detailed Normal, Up: Normal +File: diffutils.info-t, Node: Example Normal, Next: Detailed Normal, Up: Normal 2.4.1 An Example of Normal Format --------------------------------- @@ -1053,7 +1053,7 @@ shows only the lines that are different between the two files. > The door of all subtleties! -File: diffutils.info, Node: Detailed Normal, Prev: Example Normal, Up: Normal +File: diffutils.info-t, Node: Detailed Normal, Prev: Example Normal, Up: Normal 2.4.2 Detailed Description of Normal Format ------------------------------------------- @@ -1097,7 +1097,7 @@ are: after line 3 of file 2. -File: diffutils.info, Node: Scripts, Next: If-then-else, Prev: Normal, Up: Output Formats +File: diffutils.info-t, Node: Scripts, Next: If-then-else, Prev: Normal, Up: Output Formats 2.5 Making Edit Scripts ======================= @@ -1112,7 +1112,7 @@ produce TO-FILE. * RCS:: A special `diff' output format used by RCS. -File: diffutils.info, Node: ed Scripts, Next: Forward ed, Up: Scripts +File: diffutils.info-t, Node: ed Scripts, Next: Forward ed, Up: Scripts 2.5.1 `ed' Scripts ------------------ @@ -1141,7 +1141,7 @@ old' edits `old' to make it a copy of `newN'. * Detailed ed:: A detailed description of `ed' format. -File: diffutils.info, Node: Example ed, Next: Detailed ed, Up: ed Scripts +File: diffutils.info-t, Node: Example ed, Next: Detailed ed, Up: ed Scripts 2.5.1.1 Example `ed' Script ........................... @@ -1161,7 +1161,7 @@ the complete contents of the two files): 1,2d -File: diffutils.info, Node: Detailed ed, Prev: Example ed, Up: ed Scripts +File: diffutils.info-t, Node: Detailed ed, Prev: Example ed, Up: ed Scripts 2.5.1.2 Detailed Description of `ed' Format ........................................... @@ -1207,7 +1207,7 @@ are: `5,7d' means delete lines 5-7 of file 1. -File: diffutils.info, Node: Forward ed, Next: RCS, Prev: ed Scripts, Up: Scripts +File: diffutils.info-t, Node: Forward ed, Next: RCS, Prev: ed Scripts, Up: Scripts 2.5.2 Forward `ed' Scripts -------------------------- @@ -1225,7 +1225,7 @@ compatibility with older versions of `diff'. Use the `-f' or `--forward-ed' option to select it. -File: diffutils.info, Node: RCS, Prev: Forward ed, Up: Scripts +File: diffutils.info-t, Node: RCS, Prev: Forward ed, Up: Scripts 2.5.3 RCS Scripts ----------------- @@ -1257,7 +1257,7 @@ for the complete contents of the two files): The door of all subtleties! -File: diffutils.info, Node: If-then-else, Prev: Scripts, Up: Output Formats +File: diffutils.info-t, Node: If-then-else, Prev: Scripts, Up: Output Formats 2.6 Merging Files with If-then-else =================================== @@ -1299,7 +1299,7 @@ group formats and line formats, as described in the next sections. * Detailed If-then-else:: A detailed description of if-then-else format. -File: diffutils.info, Node: Line Group Formats, Next: Line Formats, Up: If-then-else +File: diffutils.info-t, Node: Line Group Formats, Next: Line Formats, Up: If-then-else 2.6.1 Line Group Formats ------------------------ @@ -1465,7 +1465,7 @@ forms. 0, to `1 line' if N is 1, and to `%dN lines' otherwise. -File: diffutils.info, Node: Line Formats, Next: Example If-then-else, Prev: Line Group Formats, Up: If-then-else +File: diffutils.info-t, Node: Line Formats, Next: Example If-then-else, Prev: Line Group Formats, Up: If-then-else 2.6.2 Line Formats ------------------ @@ -1566,7 +1566,7 @@ fine control over `diff' output. old new -File: diffutils.info, Node: Example If-then-else, Next: Detailed If-then-else, Prev: Line Formats, Up: If-then-else +File: diffutils.info-t, Node: Example If-then-else, Next: Detailed If-then-else, Prev: Line Formats, Up: If-then-else 2.6.3 An Example of If-then-else Format --------------------------------------- @@ -1599,7 +1599,7 @@ for the complete contents of the two files): #endif /* TWO */ -File: diffutils.info, Node: Detailed If-then-else, Prev: Example If-then-else, Up: If-then-else +File: diffutils.info-t, Node: Detailed If-then-else, Prev: Example If-then-else, Up: If-then-else 2.6.4 Detailed Description of If-then-else Format ------------------------------------------------- @@ -1642,10 +1642,10 @@ contain duplicate or otherwise incorrect code. The `patch' `-D NAME' option behaves like the `diff' `-D NAME' option, except it operates on a file and a diff to produce a merged -file; *Note patch Options::. +file. *Note patch Options::. -File: diffutils.info, Node: Incomplete Lines, Next: Comparing Directories, Prev: Output Formats, Up: Top +File: diffutils.info-t, Node: Incomplete Lines, Next: Comparing Directories, Prev: Output Formats, Up: Top 3 Incomplete Lines ****************** @@ -1661,8 +1661,8 @@ line by a following line that starts with `\'. However, the RCS format (*note RCS::) outputs the incomplete line as-is, without any trailing newline or following line. The side by side format normally represents incomplete lines as-is, but in some cases uses a `\' or `/' gutter -marker; *Note Side by Side::. The if-then-else line format preserves a -line's incompleteness with `%L', and discards the newline with `%l'; +marker. *Note Side by Side::. The if-then-else line format preserves +a line's incompleteness with `%L', and discards the newline with `%l'. *Note Line Formats::. Finally, with the `ed' and forward `ed' output formats (*note Output Formats::) `diff' cannot represent an incomplete line, so it pretends there was a newline and reports an error. @@ -1691,7 +1691,7 @@ outputs the following without a trailing newline: . -File: diffutils.info, Node: Comparing Directories, Next: Adjusting Output, Prev: Incomplete Lines, Up: Top +File: diffutils.info-t, Node: Comparing Directories, Next: Adjusting Output, Prev: Incomplete Lines, Up: Top 4 Comparing Directories *********************** @@ -1708,19 +1708,22 @@ subdirectories' files, but if you use the `-r' or `--recursive' option, it compares every corresponding pair of files in the directory trees, as many levels deep as they go. - For file names that are in only one of the directories, `diff' -normally does not show the contents of the file that exists; it reports -only that the file exists in that directory and not in the other. You -can make `diff' act as though the file existed but was empty in the -other directory, so that it outputs the entire contents of the file that -actually exists. (It is output as either an insertion or a deletion, -depending on whether it is in the first or the second directory given.) -To do this, use the `--new-file' (`-N') option. - - If the older directory contains one or more large files that are not -in the newer directory, you can make the patch smaller by using the + If only one file exists, `diff' normally does not show its contents; +it merely reports that one file exists but the other does not. You can +make `diff' act as though the missing file is empty, so that it outputs +the entire contents of the file that actually exists. (It is output as +either an insertion or a deletion, depending on whether the missing +file is in the first or the second position.) To do this, use the +`--new-file' (`-N') option. This option affects command-line arguments +as well as files found via directory traversal; for example, `diff -N a +b' treats `a' as empty if `a' does not exist but `b' does, and +similarly `diff -N - b' treats standard input as empty if it is closed +but `b' exists. + + If the older directory contains large files that are not in the +newer directory, you can make the patch smaller by using the `--unidirectional-new-file' option instead of `-N'. This option is -like `-N' except that it only inserts the contents of files that appear +like `-N' except that it inserts the contents only of files that appear in the second directory but not the first (that is, files that were added). At the top of the patch, write instructions for the user applying the patch to remove the files that were deleted before @@ -1766,8 +1769,13 @@ behavior. `--ignore-file-name-case' option is in effect, case is ignored when excluding file names matching the specified patterns. + To avoid that `diff' follows symbolic links, use the +`--no-dereference'. When this option is in use, symbolic links will be +treated like a special kind of files, rather than comparing the target +of each symbolic link. + -File: diffutils.info, Node: Adjusting Output, Next: diff Performance, Prev: Comparing Directories, Up: Top +File: diffutils.info-t, Node: Adjusting Output, Next: diff Performance, Prev: Comparing Directories, Up: Top 5 Making `diff' Output Prettier ******************************* @@ -1782,7 +1790,7 @@ These adjustments can be applied to any output format. * Pagination:: Page numbering and time-stamping `diff' output. -File: diffutils.info, Node: Tabs, Next: Trailing Blanks, Up: Adjusting Output +File: diffutils.info-t, Node: Tabs, Next: Trailing Blanks, Up: Adjusting Output 5.1 Preserving Tab Stop Alignment ================================= @@ -1814,7 +1822,7 @@ type indicator character. Select this method with the `-T' or `--initial-tab' option. -File: diffutils.info, Node: Trailing Blanks, Next: Pagination, Prev: Tabs, Up: Adjusting Output +File: diffutils.info-t, Node: Trailing Blanks, Next: Pagination, Prev: Tabs, Up: Adjusting Output 5.2 Omitting trailing blanks ============================ @@ -1838,7 +1846,7 @@ to be munged by text editors or by transmission via email. It is accepted by GNU `patch' as well. -File: diffutils.info, Node: Pagination, Prev: Trailing Blanks, Up: Adjusting Output +File: diffutils.info-t, Node: Pagination, Prev: Trailing Blanks, Up: Adjusting Output 5.3 Paginating `diff' Output ============================ @@ -1851,7 +1859,7 @@ for `diff -lc lao tzu': 2002-02-22 14:20 diff -lc lao tzu Page 1 -File: diffutils.info, Node: diff Performance, Next: Comparing Three Files, Prev: Adjusting Output, Up: Top +File: diffutils.info-t, Node: diff Performance, Next: Comparing Three Files, Prev: Adjusting Output, Up: Top 6 `diff' Performance Tradeoffs ****************************** @@ -1910,7 +1918,7 @@ towards the end of the file. Merging hunks can make the output look nicer in some cases. -File: diffutils.info, Node: Comparing Three Files, Next: diff3 Merging, Prev: diff Performance, Up: Top +File: diffutils.info-t, Node: Comparing Three Files, Next: diff3 Merging, Prev: diff Performance, Up: Top 7 Comparing Three Files *********************** @@ -1929,11 +1937,11 @@ location in the input files. * Sample diff3 Input:: Sample `diff3' input for examples. * Example diff3 Normal:: Sample output in the normal format. -* diff3 Hunks:: The format of normal output format. * Detailed diff3 Normal:: A detailed description of normal output format. +* diff3 Hunks:: The format of normal output format. -File: diffutils.info, Node: Sample diff3 Input, Next: Example diff3 Normal, Up: Comparing Three Files +File: diffutils.info-t, Node: Sample diff3 Input, Next: Example diff3 Normal, Up: Comparing Three Files 7.1 A Third Sample Input File ============================= @@ -1959,7 +1967,7 @@ Input::). This is the third sample file, called `tao': -- The Way of Lao-Tzu, tr. Wing-tsit Chan -File: diffutils.info, Node: Example diff3 Normal, Next: diff3 Hunks, Prev: Sample diff3 Input, Up: Comparing Three Files +File: diffutils.info-t, Node: Example diff3 Normal, Next: Detailed diff3 Normal, Prev: Sample diff3 Input, Up: Comparing Three Files 7.2 An Example of `diff3' Normal Format ======================================= @@ -1998,7 +2006,7 @@ shows only the lines that are different among the three files. -- The Way of Lao-Tzu, tr. Wing-tsit Chan -File: diffutils.info, Node: Detailed diff3 Normal, Prev: diff3 Hunks, Up: Comparing Three Files +File: diffutils.info-t, Node: Detailed diff3 Normal, Next: diff3 Hunks, Prev: Example diff3 Normal, Up: Comparing Three Files 7.3 Detailed Description of `diff3' Normal Format ================================================= @@ -2036,7 +2044,7 @@ Incomplete Lines::), it is distinguished on output from a full line by a following line that starts with `\'. -File: diffutils.info, Node: diff3 Hunks, Next: Detailed diff3 Normal, Prev: Example diff3 Normal, Up: Comparing Three Files +File: diffutils.info-t, Node: diff3 Hunks, Prev: Detailed diff3 Normal, Up: Comparing Three Files 7.4 `diff3' Hunks ================= @@ -2077,7 +2085,7 @@ all three files, then a three-way hunk containing the last line of each file. -File: diffutils.info, Node: diff3 Merging, Next: Interactive Merging, Prev: Comparing Three Files, Up: Top +File: diffutils.info-t, Node: diff3 Merging, Next: Interactive Merging, Prev: Comparing Three Files, Up: Top 8 Merging From a Common Ancestor ******************************** @@ -2128,7 +2136,7 @@ this bypasses some problems with `ed'. * Saving the Changed File:: Emulating System V behavior. -File: diffutils.info, Node: Which Changes, Next: Marking Conflicts, Up: diff3 Merging +File: diffutils.info-t, Node: Which Changes, Next: Marking Conflicts, Up: diff3 Merging 8.1 Selecting Which Changes to Incorporate ========================================== @@ -2171,7 +2179,7 @@ changes output by `-3' and `-x'. . -File: diffutils.info, Node: Marking Conflicts, Next: Bypassing ed, Prev: Which Changes, Up: diff3 Merging +File: diffutils.info-t, Node: Marking Conflicts, Next: Bypassing ed, Prev: Which Changes, Up: diff3 Merging 8.2 Marking Conflicts ===================== @@ -2245,7 +2253,7 @@ that the output looks like it came from files named `X', `Y' and `Z' rather than from files named `A', `B' and `C'. -File: diffutils.info, Node: Bypassing ed, Next: Merging Incomplete Lines, Prev: Marking Conflicts, Up: diff3 Merging +File: diffutils.info-t, Node: Bypassing ed, Next: Merging Incomplete Lines, Prev: Marking Conflicts, Up: diff3 Merging 8.3 Generating the Merged Output Directly ========================================= @@ -2283,7 +2291,7 @@ Input:: for a copy of the input files) would output the following: >>>>>>> tao -File: diffutils.info, Node: Merging Incomplete Lines, Next: Saving the Changed File, Prev: Bypassing ed, Up: diff3 Merging +File: diffutils.info-t, Node: Merging Incomplete Lines, Next: Saving the Changed File, Prev: Bypassing ed, Up: diff3 Merging 8.4 How `diff3' Merges Incomplete Lines ======================================= @@ -2300,7 +2308,7 @@ incomplete line is found, `diff3' generates a warning and acts as if a newline had been present. -File: diffutils.info, Node: Saving the Changed File, Prev: Merging Incomplete Lines, Up: diff3 Merging +File: diffutils.info-t, Node: Saving the Changed File, Prev: Merging Incomplete Lines, Up: diff3 Merging 8.5 Saving the Changed File =========================== @@ -2315,7 +2323,7 @@ and appends the `w' and `q' commands. and is incompatible with the merged output option `-m'. -File: diffutils.info, Node: Interactive Merging, Next: Merging with patch, Prev: diff3 Merging, Up: Top +File: diffutils.info-t, Node: Interactive Merging, Next: Merging with patch, Prev: diff3 Merging, Up: Top 9 Interactive Merging with `sdiff' ********************************** @@ -2334,7 +2342,7 @@ package `emerge'. *Note emerge: (emacs)emerge, for more information. * Merge Commands:: Merging two files interactively. -File: diffutils.info, Node: sdiff Option Summary, Next: Merge Commands, Up: Interactive Merging +File: diffutils.info-t, Node: sdiff Option Summary, Next: Merge Commands, Up: Interactive Merging 9.1 Specifying `diff' Options to `sdiff' ======================================== @@ -2363,7 +2371,7 @@ of `diff': with `sdiff', `-w COLUMNS' is equivalent to `--side-by-side' (`-y') option (*note Side by Side::). -File: diffutils.info, Node: Merge Commands, Prev: sdiff Option Summary, Up: Interactive Merging +File: diffutils.info-t, Node: Merge Commands, Prev: sdiff Option Summary, Up: Interactive Merging 9.2 Merge Commands ================== @@ -2416,7 +2424,7 @@ Follow each command with <RET>. variable if it is set. The default is system-dependent. -File: diffutils.info, Node: Merging with patch, Next: Making Patches, Prev: Interactive Merging, Up: Top +File: diffutils.info-t, Node: Merging with patch, Next: Making Patches, Prev: Interactive Merging, Up: Top 10 Merging with `patch' *********************** @@ -2465,7 +2473,7 @@ each file F with its new version, putting reject hunks (if any) into * patch and Tradition:: GNU versus traditional `patch'. -File: diffutils.info, Node: patch Input, Next: Revision Control, Up: Merging with patch +File: diffutils.info-t, Node: patch Input, Next: Revision Control, Up: Merging with patch 10.1 Selecting the `patch' Input Format ======================================= @@ -2494,7 +2502,7 @@ format of diff. The output formats listed here are the only ones that unified diff. -File: diffutils.info, Node: Revision Control, Next: Imperfect, Prev: patch Input, Up: Merging with patch +File: diffutils.info-t, Node: Revision Control, Next: Imperfect, Prev: patch Input, Up: Merging with patch 10.2 Revision Control ===================== @@ -2519,7 +2527,7 @@ value is zero if `patch' is conforming to POSIX, negative otherwise. `VERSION_CONTROL' environment variable (*note Backup Names::). -File: diffutils.info, Node: Imperfect, Next: Creating and Removing, Prev: Revision Control, Up: Merging with patch +File: diffutils.info-t, Node: Imperfect, Next: Creating and Removing, Prev: Revision Control, Up: Merging with patch 10.3 Applying Imperfect Patches =============================== @@ -2546,7 +2554,7 @@ intervention or testing. * Dry Runs:: Predicting what `patch' will do. -File: diffutils.info, Node: Changed White Space, Next: Reversed Patches, Up: Imperfect +File: diffutils.info-t, Node: Changed White Space, Next: Reversed Patches, Up: Imperfect 10.3.1 Applying Patches with Changed White Space ------------------------------------------------ @@ -2562,7 +2570,7 @@ the input files. Non-blank characters must still match exactly. Each line of the context must still match a line in the input file. -File: diffutils.info, Node: Reversed Patches, Next: Inexact, Prev: Changed White Space, Up: Imperfect +File: diffutils.info-t, Node: Reversed Patches, Next: Inexact, Prev: Changed White Space, Up: Imperfect 10.3.2 Applying Reversed Patches -------------------------------- @@ -2592,7 +2600,7 @@ subsequent "apply anyway" question--or type `C-c' to kill the `patch' process. -File: diffutils.info, Node: Inexact, Next: Dry Runs, Prev: Reversed Patches, Up: Imperfect +File: diffutils.info-t, Node: Inexact, Next: Dry Runs, Prev: Reversed Patches, Up: Imperfect 10.3.3 Helping `patch' Find Inexact Matches ------------------------------------------- @@ -2659,7 +2667,7 @@ is applied to an exact copy of the file that the patch was generated from. -File: diffutils.info, Node: Dry Runs, Prev: Inexact, Up: Imperfect +File: diffutils.info-t, Node: Dry Runs, Prev: Inexact, Up: Imperfect 10.3.4 Predicting what `patch' will do -------------------------------------- @@ -2677,7 +2685,7 @@ patch you can apply it by invoking `patch' as before, but this time without the `--dry-run' option. -File: diffutils.info, Node: Creating and Removing, Next: Patching Time Stamps, Prev: Imperfect, Up: Merging with patch +File: diffutils.info-t, Node: Creating and Removing, Next: Patching Time Stamps, Prev: Imperfect, Up: Merging with patch 10.4 Creating and Removing Files ================================ @@ -2698,7 +2706,7 @@ does not appear to be one that removed the file. asks for confirmation before applying the patch. -File: diffutils.info, Node: Patching Time Stamps, Next: Multiple Patches, Prev: Creating and Removing, Up: Merging with patch +File: diffutils.info-t, Node: Patching Time Stamps, Next: Multiple Patches, Prev: Creating and Removing, Up: Merging with patch 10.5 Updating Time Stamps on Patched Files ========================================== @@ -2740,7 +2748,7 @@ on the patched files, so that later invocations of `make' do not get confused by the patched files' times. -File: diffutils.info, Node: Multiple Patches, Next: patch Directories, Prev: Patching Time Stamps, Up: Merging with patch +File: diffutils.info-t, Node: Multiple Patches, Next: patch Directories, Prev: Patching Time Stamps, Up: Merging with patch 10.6 Multiple Patches in a File =============================== @@ -2798,7 +2806,7 @@ first remaining name. POSIX. -File: diffutils.info, Node: patch Directories, Next: Backups, Prev: Multiple Patches, Up: Merging with patch +File: diffutils.info-t, Node: patch Directories, Next: Backups, Prev: Multiple Patches, Up: Merging with patch 10.7 Applying Patches in Other Directories ========================================== @@ -2832,7 +2840,7 @@ in the current directory, or if you used the `-d DIRECTORY' option, in that directory. -File: diffutils.info, Node: Backups, Next: Backup Names, Prev: patch Directories, Up: Merging with patch +File: diffutils.info-t, Node: Backups, Next: Backup Names, Prev: patch Directories, Up: Merging with patch 10.8 Backup Files ================= @@ -2856,7 +2864,7 @@ backup file is created as a placeholder to represent the nonexistent file. -File: diffutils.info, Node: Backup Names, Next: Reject Names, Prev: Backups, Up: Merging with patch +File: diffutils.info-t, Node: Backup Names, Next: Reject Names, Prev: Backups, Up: Merging with patch 10.9 Backup File Names ====================== @@ -2928,7 +2936,7 @@ section have any affect, because no backups are made. use `~', but this should be fixed in the next release. -File: diffutils.info, Node: Reject Names, Next: patch Messages, Prev: Backup Names, Up: Merging with patch +File: diffutils.info-t, Node: Reject Names, Next: patch Messages, Prev: Backup Names, Up: Merging with patch 10.10 Reject File Names ======================= @@ -2944,7 +2952,7 @@ patches in a single file. The `-r REJECT-FILE' or name. -File: diffutils.info, Node: patch Messages, Next: patch and POSIX, Prev: Reject Names, Up: Merging with patch +File: diffutils.info-t, Node: patch Messages, Next: patch and POSIX, Prev: Reject Names, Up: Merging with patch 10.11 Messages and Questions from `patch' ========================================= @@ -2968,7 +2976,7 @@ When applying a set of patches in a loop, you should check the exit status, so you don't apply a later patch to a partially patched file. -File: diffutils.info, Node: More or Fewer Messages, Next: patch and Keyboard Input, Up: patch Messages +File: diffutils.info-t, Node: More or Fewer Messages, Next: patch and Keyboard Input, Up: patch Messages 10.11.1 Controlling the Verbosity of `patch' -------------------------------------------- @@ -2983,7 +2991,7 @@ of patch it is. occurs, by using the `-s', `--quiet', or `--silent' option. -File: diffutils.info, Node: patch and Keyboard Input, Next: patch Quoting Style, Prev: More or Fewer Messages, Up: patch Messages +File: diffutils.info-t, Node: patch and Keyboard Input, Next: patch Quoting Style, Prev: More or Fewer Messages, Up: patch Messages 10.11.2 Inhibiting Keyboard Input --------------------------------- @@ -3012,7 +3020,7 @@ questions, but it makes somewhat different assumptions: * Assume that patches are reversed if they look like they are. -File: diffutils.info, Node: patch Quoting Style, Prev: patch and Keyboard Input, Up: patch Messages +File: diffutils.info-t, Node: patch Quoting Style, Prev: patch and Keyboard Input, Up: patch Messages 10.11.3 `patch' Quoting Style ----------------------------- @@ -3047,7 +3055,7 @@ variable is not set, the default value is `shell', but this default may change in a future version of `patch'. -File: diffutils.info, Node: patch and POSIX, Next: patch and Tradition, Prev: patch Messages, Up: Merging with patch +File: diffutils.info-t, Node: patch and POSIX, Next: patch and Tradition, Prev: patch Messages, Up: Merging with patch 10.12 `patch' and the POSIX Standard ==================================== @@ -3072,7 +3080,7 @@ standard, as follows: -File: diffutils.info, Node: patch and Tradition, Prev: patch and POSIX, Up: Merging with patch +File: diffutils.info-t, Node: patch and Tradition, Prev: patch and POSIX, Up: Merging with patch 10.13 GNU `patch' and Traditional `patch' ========================================= @@ -3151,7 +3159,7 @@ version 2.1 and earlier. -File: diffutils.info, Node: Making Patches, Next: Invoking cmp, Prev: Merging with patch, Up: Top +File: diffutils.info-t, Node: Making Patches, Next: Invoking cmp, Prev: Merging with patch, Up: Top 11 Tips for Making and Using Patches ************************************ @@ -3172,7 +3180,7 @@ to distribute patches for updating a software package. * Generating Smaller Patches:: How to generate smaller patches. -File: diffutils.info, Node: Tips for Patch Producers, Next: Tips for Patch Consumers, Up: Making Patches +File: diffutils.info-t, Node: Tips for Patch Producers, Next: Tips for Patch Consumers, Up: Making Patches 11.1 Tips for Patch Producers ============================= @@ -3201,7 +3209,7 @@ recipient and applying your patches to a copy of the original files. when generating a patch. -File: diffutils.info, Node: Tips for Patch Consumers, Next: Avoiding Common Mistakes, Prev: Tips for Patch Producers, Up: Making Patches +File: diffutils.info-t, Node: Tips for Patch Consumers, Next: Avoiding Common Mistakes, Prev: Tips for Patch Producers, Up: Making Patches 11.2 Tips for Patch Consumers ============================= @@ -3216,7 +3224,7 @@ cannot patch such files. If you are having trouble applying such patches, try upgrading to a recent version of GNU `patch'. -File: diffutils.info, Node: Avoiding Common Mistakes, Next: Generating Smaller Patches, Prev: Tips for Patch Consumers, Up: Making Patches +File: diffutils.info-t, Node: Avoiding Common Mistakes, Next: Generating Smaller Patches, Prev: Tips for Patch Consumers, Up: Making Patches 11.3 Avoiding Common Mistakes ============================= @@ -3268,7 +3276,7 @@ proceeding. This makes it difficult to accidentally apply patches in the wrong order. -File: diffutils.info, Node: Generating Smaller Patches, Prev: Avoiding Common Mistakes, Up: Making Patches +File: diffutils.info-t, Node: Generating Smaller Patches, Prev: Avoiding Common Mistakes, Up: Making Patches 11.4 Generating Smaller Patches =============================== @@ -3303,7 +3311,7 @@ but bear in mind that `patch' typically needs at least two lines for proper operation when patches do not exactly match the input files. -File: diffutils.info, Node: Invoking cmp, Next: Invoking diff, Prev: Making Patches, Up: Top +File: diffutils.info-t, Node: Invoking cmp, Next: Invoking diff, Prev: Making Patches, Up: Top 12 Invoking `cmp' ***************** @@ -3343,7 +3351,7 @@ differences were found, and 2 means trouble. * cmp Options:: Summary of options to `cmp'. -File: diffutils.info, Node: cmp Options, Up: Invoking cmp +File: diffutils.info-t, Node: cmp Options, Up: Invoking cmp 12.1 Options to `cmp' ===================== @@ -3375,8 +3383,11 @@ can be combined into a single command line word: `-bl' is equivalent to `-l' `--verbose' Output the (decimal) byte numbers and (octal) values of all - differing bytes, instead of the default standard output. Also, - output the EOF message if one file is shorter than the other. + differing bytes, instead of the default standard output. Each + output line contains a differing byte's number relative to the + start of the input, followed by the differing byte values. Byte + numbers start at 1. Also, output the EOF message if one file is + shorter than the other. `-n COUNT' `--bytes=COUNT' @@ -3471,7 +3482,7 @@ rejected by your computer due to limitations of its arithmetic. extension to IEC 60027-2.) -File: diffutils.info, Node: Invoking diff, Next: Invoking diff3, Prev: Invoking cmp, Up: Top +File: diffutils.info-t, Node: Invoking diff, Next: Invoking diff3, Prev: Invoking cmp, Up: Top 13 Invoking `diff' ****************** @@ -3516,7 +3527,7 @@ binary files count as trouble, but this can be altered by using the * diff Options:: Summary of options to `diff'. -File: diffutils.info, Node: diff Options, Up: Invoking diff +File: diffutils.info-t, Node: diff Options, Up: Invoking diff 13.1 Options to `diff' ====================== @@ -3647,8 +3658,7 @@ optional argument. `-N' `--new-file' - In directory comparison, if a file is found in only one directory, - treat it as present but empty in the other directory. *Note + If one file is missing, treat it as present but empty. *Note Comparing Directories::. `--new-group-format=FORMAT' @@ -3659,6 +3669,9 @@ optional argument. Use FORMAT to output a line taken from just the second file in if-then-else format. *Note Line Formats::. +`--no-dereference' + Act on symbolic links themselves instead of what they point to. + `--old-group-format=FORMAT' Use FORMAT to output a group of lines taken from just the first file in if-then-else format. *Note Line Group Formats::. @@ -3740,9 +3753,8 @@ optional argument. format. *Note Line Formats::. `--unidirectional-new-file' - When comparing directories, if a file appears only in the second - directory of the two, treat it as present but empty in the other. - *Note Comparing Directories::. + If a first file is missing, treat it as present but empty. *Note + Comparing Directories::. `-U LINES' `--unified[=LINES]' @@ -3789,7 +3801,7 @@ optional argument. Ignore white space at line end. *Note White Space::. -File: diffutils.info, Node: Invoking diff3, Next: Invoking patch, Prev: Invoking diff, Up: Top +File: diffutils.info-t, Node: Invoking diff3, Next: Invoking patch, Prev: Invoking diff, Up: Top 14 Invoking `diff3' ******************* @@ -3811,7 +3823,7 @@ conflicts were found, and 2 means trouble. * diff3 Options:: Summary of options to `diff3'. -File: diffutils.info, Node: diff3 Options, Up: Invoking diff3 +File: diffutils.info-t, Node: diff3 Options, Up: Invoking diff3 14.1 Options to `diff3' ======================= @@ -3908,7 +3920,7 @@ combined into a single command line argument. Which Changes::. -File: diffutils.info, Node: Invoking patch, Next: Invoking sdiff, Prev: Invoking diff3, Up: Top +File: diffutils.info-t, Node: Invoking patch, Next: Invoking sdiff, Prev: Invoking diff3, Up: Top 15 Invoking `patch' ******************* @@ -3943,7 +3955,7 @@ if FILE is one of the input files. * patch Options:: Summary table of options to `patch'. -File: diffutils.info, Node: patch Options, Up: Invoking patch +File: diffutils.info-t, Node: patch Options, Up: Invoking patch 15.1 Options to `patch' ======================= @@ -4126,7 +4138,7 @@ combined into a single command line argument with only one dash. -File: diffutils.info, Node: Invoking sdiff, Next: Standards conformance, Prev: Invoking patch, Up: Top +File: diffutils.info-t, Node: Invoking sdiff, Next: Standards conformance, Prev: Invoking patch, Up: Top 16 Invoking `sdiff' ******************* @@ -4158,7 +4170,7 @@ differences were found, and 2 means trouble. * sdiff Options:: Summary of options to `diff'. -File: diffutils.info, Node: sdiff Options, Up: Invoking sdiff +File: diffutils.info-t, Node: sdiff Options, Up: Invoking sdiff 16.1 Options to `sdiff' ======================= @@ -4262,7 +4274,7 @@ options can be abbreviated to any unique prefix of their name. Ignore white space at line end. *Note White Space::. -File: diffutils.info, Node: Standards conformance, Next: Projects, Prev: Invoking sdiff, Up: Top +File: diffutils.info-t, Node: Standards conformance, Next: Projects, Prev: Invoking sdiff, Up: Top 17 Standards conformance ************************ @@ -4297,7 +4309,7 @@ around the compatibility problems by setting `_POSIX2_VERSION=199209' in your environment. -File: diffutils.info, Node: Projects, Next: Copying This Manual, Prev: Standards conformance, Up: Top +File: diffutils.info-t, Node: Projects, Next: Copying This Manual, Prev: Standards conformance, Up: Top 18 Future Projects ****************** @@ -4318,7 +4330,7 @@ to coordinate with other volunteers. * Bugs:: Reporting bugs. -File: diffutils.info, Node: Shortcomings, Next: Bugs, Up: Projects +File: diffutils.info-t, Node: Shortcomings, Next: Bugs, Up: Projects 18.1 Suggested Projects for Improving GNU `diff' and `patch' ============================================================ @@ -4341,7 +4353,7 @@ These shortcomings motivate the following suggested projects. * Speedups:: Improving performance. -File: diffutils.info, Node: Internationalization, Next: Changing Structure, Up: Shortcomings +File: diffutils.info-t, Node: Internationalization, Next: Changing Structure, Up: Shortcomings 18.1.1 Handling Multibyte and Varying-Width Characters ------------------------------------------------------ @@ -4366,7 +4378,7 @@ Unfortunately, these patches are incomplete and are to an older version of `diff', so more work needs to be done in this area. -File: diffutils.info, Node: Changing Structure, Next: Special Files, Prev: Internationalization, Up: Shortcomings +File: diffutils.info-t, Node: Changing Structure, Next: Special Files, Prev: Internationalization, Up: Shortcomings 18.1.2 Handling Changes to the Directory Structure -------------------------------------------------- @@ -4389,7 +4401,7 @@ represent changes in directory structure, and extending `patch' to understand these extensions. -File: diffutils.info, Node: Special Files, Next: Unusual File Names, Prev: Changing Structure, Up: Shortcomings +File: diffutils.info-t, Node: Special Files, Next: Unusual File Names, Prev: Changing Structure, Up: Shortcomings 18.1.3 Files that are Neither Directories Nor Regular Files ----------------------------------------------------------- @@ -4410,7 +4422,7 @@ files, instead of the change to the symbolic link. and `patch' should be extended to understand these extensions. -File: diffutils.info, Node: Unusual File Names, Next: Time Stamp Order, Prev: Special Files, Up: Shortcomings +File: diffutils.info-t, Node: Unusual File Names, Next: Time Stamp Order, Prev: Special Files, Up: Shortcomings 18.1.4 File Names that Contain Unusual Characters ------------------------------------------------- @@ -4423,7 +4435,7 @@ that is syntactically correct but patches the wrong files. The format of `diff' output should be extended to handle all possible file names. -File: diffutils.info, Node: Time Stamp Order, Next: Ignoring Changes, Prev: Unusual File Names, Up: Shortcomings +File: diffutils.info-t, Node: Time Stamp Order, Next: Ignoring Changes, Prev: Unusual File Names, Up: Shortcomings 18.1.5 Outputting Diffs in Time Stamp Order ------------------------------------------- @@ -4437,7 +4449,7 @@ way to do this would be to implement a `diff' option to output diffs in time stamp order. -File: diffutils.info, Node: Ignoring Changes, Next: Speedups, Prev: Time Stamp Order, Up: Shortcomings +File: diffutils.info-t, Node: Ignoring Changes, Next: Speedups, Prev: Time Stamp Order, Up: Shortcomings 18.1.6 Ignoring Certain Changes ------------------------------- @@ -4459,7 +4471,7 @@ e.g.: However, this outputs the filtered text, not the original. -File: diffutils.info, Node: Speedups, Prev: Ignoring Changes, Up: Shortcomings +File: diffutils.info-t, Node: Speedups, Prev: Ignoring Changes, Up: Shortcomings 18.1.7 Improving Performance ---------------------------- @@ -4471,7 +4483,7 @@ originally copied from the other with time stamps preserved (e.g., with the same content. *Note diff Performance::. -File: diffutils.info, Node: Bugs, Prev: Shortcomings, Up: Projects +File: diffutils.info-t, Node: Bugs, Prev: Shortcomings, Up: Projects 18.2 Reporting Bugs =================== @@ -4490,7 +4502,7 @@ patch is relative to a recent test release, which you can find in the directory `ftp://alpha.gnu.org/gnu/diffutils/'. -File: diffutils.info, Node: Copying This Manual, Next: Translations, Prev: Projects, Up: Top +File: diffutils.info-t, Node: Copying This Manual, Next: Translations, Prev: Projects, Up: Top Appendix A Copying This Manual ****************************** @@ -4976,7 +4988,7 @@ free software license, such as the GNU General Public License, to permit their use in free software. -File: diffutils.info, Node: Translations, Next: Index, Prev: Copying This Manual, Up: Top +File: diffutils.info-t, Node: Translations, Next: Index, Prev: Copying This Manual, Up: Top Appendix B Translations of This Manual ************************************** @@ -4986,7 +4998,7 @@ translation of this manual. Its most recent version can be found at `http://openlab.ring.gr.jp/gnujdoc/cvsweb/cvsweb.cgi/gnujdoc/'. -File: diffutils.info, Node: Index, Prev: Translations, Up: Top +File: diffutils.info-t, Node: Index, Prev: Translations, Up: Top Appendix C Index **************** @@ -5041,8 +5053,8 @@ Appendix C Index * EDITOR: Merge Commands. (line 50) * empty files, removing: Creating and Removing. (line 6) -* exabyte, definition of: cmp Options. (line 106) -* exbibyte, definition of: cmp Options. (line 110) +* exabyte, definition of: cmp Options. (line 109) +* exbibyte, definition of: cmp Options. (line 113) * file name alternates: Alternate Names. (line 6) * file names with unusual characters: Unusual File Names. (line 6) * format of diff output: Output Formats. (line 6) @@ -5053,8 +5065,8 @@ Appendix C Index * full lines: Incomplete Lines. (line 6) * function headings, C: C Function Headings. (line 6) * fuzz factor when patching: Inexact. (line 6) -* gibibyte, definition of: cmp Options. (line 89) -* gigabyte, definition of: cmp Options. (line 85) +* gibibyte, definition of: cmp Options. (line 92) +* gigabyte, definition of: cmp Options. (line 88) * headings: Sections. (line 6) * hunks: Hunks. (line 6) * hunks for diff3: diff3 Hunks. (line 6) @@ -5077,16 +5089,16 @@ Appendix C Index * invoking sdiff: Invoking sdiff. (line 6) * keyboard input to patch: patch and Keyboard Input. (line 6) -* kibibyte, definition of: cmp Options. (line 73) -* kilobyte, definition of: cmp Options. (line 68) +* kibibyte, definition of: cmp Options. (line 76) +* kilobyte, definition of: cmp Options. (line 71) * LC_COLLATE: Comparing Directories. (line 6) * LC_NUMERIC: Line Group Formats. (line 144) * LC_TIME: Detailed Context. (line 12) * line formats: Line Formats. (line 6) * line group formats: Line Group Formats. (line 6) -* mebibyte, definition of: cmp Options. (line 82) -* megabyte, definition of: cmp Options. (line 78) +* mebibyte, definition of: cmp Options. (line 85) +* megabyte, definition of: cmp Options. (line 81) * merge commands: Merge Commands. (line 6) * merged diff3 format: Bypassing ed. (line 6) * merged output format: If-then-else. (line 6) @@ -5123,9 +5135,9 @@ Appendix C Index * patches, shrinking: Generating Smaller Patches. (line 6) * patching directories: patch Directories. (line 6) -* pebibyte, definition of: cmp Options. (line 103) +* pebibyte, definition of: cmp Options. (line 106) * performance of diff: diff Performance. (line 6) -* petabyte, definition of: cmp Options. (line 99) +* petabyte, definition of: cmp Options. (line 102) * POSIX <1>: Standards conformance. (line 6) * POSIX: patch and POSIX. (line 6) @@ -5164,8 +5176,8 @@ Appendix C Index (line 6) * tab and blank difference suppression: White Space. (line 6) * tab stop alignment: Tabs. (line 6) -* tebibyte, definition of: cmp Options. (line 96) -* terabyte, definition of: cmp Options. (line 92) +* tebibyte, definition of: cmp Options. (line 99) +* terabyte, definition of: cmp Options. (line 95) * testing patch: Dry Runs. (line 6) * text versus binary diff: Binary. (line 6) * time stamp format, context diffs: Detailed Context. (line 12) @@ -5185,124 +5197,124 @@ Appendix C Index * VERSION_CONTROL <1>: Backup Names. (line 21) * VERSION_CONTROL: Revision Control. (line 22) * white space in patches: Changed White Space. (line 6) -* yottabyte, definition of: cmp Options. (line 121) -* zettabyte, definition of: cmp Options. (line 113) +* yottabyte, definition of: cmp Options. (line 124) +* zettabyte, definition of: cmp Options. (line 116) Tag Table: -Node: Top1433 -Node: Overview3646 -Node: Comparison7275 -Node: Hunks9978 -Node: White Space11420 -Node: Blank Lines13259 -Node: Specified Lines14251 -Node: Case Folding15377 -Node: Brief15794 -Node: Binary17117 -Node: Output Formats21202 -Node: Sample diff Input21927 -Node: Context23426 -Node: Context Format25003 -Node: Example Context25795 -Node: Less Context27302 -Node: Detailed Context28491 -Node: Unified Format30689 -Node: Example Unified31486 -Node: Detailed Unified32524 -Node: Sections34171 -Node: Specified Headings34930 -Node: C Function Headings36481 -Node: Alternate Names37326 -Node: Side by Side38240 -Node: Side by Side Format40389 -Node: Example Side by Side41290 -Node: Normal42630 -Node: Example Normal43630 -Node: Detailed Normal44366 -Node: Scripts46105 -Node: ed Scripts46510 -Node: Example ed47716 -Node: Detailed ed48166 -Node: Forward ed49925 -Node: RCS50701 -Node: If-then-else51916 -Node: Line Group Formats53594 -Node: Line Formats59470 -Node: Example If-then-else62740 -Node: Detailed If-then-else63819 -Node: Incomplete Lines65702 -Node: Comparing Directories67339 -Node: Adjusting Output71383 -Node: Tabs71890 -Node: Trailing Blanks73504 -Node: Pagination74730 -Node: diff Performance75198 -Node: Comparing Three Files78285 -Node: Sample diff3 Input79163 -Node: Example diff3 Normal80111 -Node: Detailed diff3 Normal81161 -Node: diff3 Hunks82920 -Node: diff3 Merging84216 -Node: Which Changes86460 -Node: Marking Conflicts87860 -Node: Bypassing ed90316 -Node: Merging Incomplete Lines91659 -Node: Saving the Changed File92385 -Node: Interactive Merging93001 -Node: sdiff Option Summary93710 -Node: Merge Commands94913 -Node: Merging with patch96202 -Node: patch Input98574 -Node: Revision Control99256 -Node: Imperfect100426 -Node: Changed White Space101574 -Node: Reversed Patches102371 -Node: Inexact103835 -Node: Dry Runs107393 -Node: Creating and Removing108257 -Node: Patching Time Stamps109306 -Node: Multiple Patches111505 -Node: patch Directories114168 -Node: Backups115793 -Node: Backup Names116858 -Ref: Backup Names-Footnote-1119825 -Node: Reject Names119952 -Node: patch Messages120541 -Node: More or Fewer Messages121601 -Node: patch and Keyboard Input122232 -Node: patch Quoting Style123261 -Node: patch and POSIX124411 -Node: patch and Tradition125251 -Node: Making Patches128707 -Node: Tips for Patch Producers129533 -Node: Tips for Patch Consumers130789 -Node: Avoiding Common Mistakes131426 -Node: Generating Smaller Patches133951 -Node: Invoking cmp135712 -Node: cmp Options137135 -Node: Invoking diff140627 -Node: diff Options142483 -Node: Invoking diff3151185 -Node: diff3 Options151823 -Node: Invoking patch154856 -Node: patch Options156064 -Node: Invoking sdiff161291 -Node: sdiff Options162434 -Node: Standards conformance165405 -Node: Projects167151 -Node: Shortcomings167862 -Node: Internationalization168964 -Node: Changing Structure170130 -Node: Special Files171234 -Node: Unusual File Names172346 -Node: Time Stamp Order172985 -Node: Ignoring Changes173628 -Node: Speedups174398 -Node: Bugs174862 -Node: Copying This Manual175715 -Node: Translations200854 -Node: Index201226 +Node: Top1434 +Node: Overview3648 +Node: Comparison7279 +Node: Hunks9984 +Node: White Space11428 +Node: Blank Lines13269 +Node: Specified Lines14263 +Node: Case Folding15391 +Node: Brief15810 +Node: Binary17135 +Node: Output Formats21222 +Node: Sample diff Input21949 +Node: Context23450 +Node: Context Format25029 +Node: Example Context25823 +Node: Less Context27332 +Node: Detailed Context28523 +Node: Unified Format30723 +Node: Example Unified31522 +Node: Detailed Unified32562 +Node: Sections34207 +Node: Specified Headings34968 +Node: C Function Headings36521 +Node: Alternate Names37368 +Node: Side by Side38284 +Node: Side by Side Format40436 +Node: Example Side by Side41339 +Node: Normal42681 +Node: Example Normal43683 +Node: Detailed Normal44421 +Node: Scripts46162 +Node: ed Scripts46569 +Node: Example ed47777 +Node: Detailed ed48229 +Node: Forward ed49990 +Node: RCS50768 +Node: If-then-else51985 +Node: Line Group Formats53665 +Node: Line Formats59543 +Node: Example If-then-else62815 +Node: Detailed If-then-else63896 +Node: Incomplete Lines65782 +Node: Comparing Directories67422 +Node: Adjusting Output71856 +Node: Tabs72365 +Node: Trailing Blanks73981 +Node: Pagination75209 +Node: diff Performance75679 +Node: Comparing Three Files78768 +Node: Sample diff3 Input79648 +Node: Example diff3 Normal80598 +Node: Detailed diff3 Normal81660 +Node: diff3 Hunks83450 +Node: diff3 Merging84719 +Node: Which Changes86965 +Node: Marking Conflicts88367 +Node: Bypassing ed90825 +Node: Merging Incomplete Lines92170 +Node: Saving the Changed File92898 +Node: Interactive Merging93516 +Node: sdiff Option Summary94227 +Node: Merge Commands95432 +Node: Merging with patch96723 +Node: patch Input99097 +Node: Revision Control99781 +Node: Imperfect100953 +Node: Changed White Space102103 +Node: Reversed Patches102902 +Node: Inexact104368 +Node: Dry Runs107928 +Node: Creating and Removing108794 +Node: Patching Time Stamps109845 +Node: Multiple Patches112046 +Node: patch Directories114711 +Node: Backups116338 +Node: Backup Names117405 +Ref: Backup Names-Footnote-1120374 +Node: Reject Names120501 +Node: patch Messages121092 +Node: More or Fewer Messages122154 +Node: patch and Keyboard Input122787 +Node: patch Quoting Style123818 +Node: patch and POSIX124970 +Node: patch and Tradition125812 +Node: Making Patches129270 +Node: Tips for Patch Producers130098 +Node: Tips for Patch Consumers131356 +Node: Avoiding Common Mistakes131995 +Node: Generating Smaller Patches134522 +Node: Invoking cmp136285 +Node: cmp Options137710 +Node: Invoking diff141373 +Node: diff Options143231 +Node: Invoking diff3151877 +Node: diff3 Options152517 +Node: Invoking patch155552 +Node: patch Options156762 +Node: Invoking sdiff161991 +Node: sdiff Options163136 +Node: Standards conformance166109 +Node: Projects167857 +Node: Shortcomings168570 +Node: Internationalization169674 +Node: Changing Structure170842 +Node: Special Files171948 +Node: Unusual File Names173062 +Node: Time Stamp Order173703 +Node: Ignoring Changes174348 +Node: Speedups175120 +Node: Bugs175586 +Node: Copying This Manual176441 +Node: Translations201582 +Node: Index201956 End Tag Table diff --git a/doc/diffutils.texi b/doc/diffutils.texi index 222e9b7..2d238dc 100644 --- a/doc/diffutils.texi +++ b/doc/diffutils.texi @@ -14,7 +14,7 @@ and documents the @acronym{GNU} @command{diff}, @command{diff3}, differences between files and the @acronym{GNU} @command{patch} command for using their output to update files. -Copyright @copyright{} 1992-1994, 1998, 2001-2002, 2004, 2006, 2009-2011 Free +Copyright @copyright{} 1992-1994, 1998, 2001-2002, 2004, 2006, 2009-2013 Free Software Foundation, Inc. @quotation @@ -821,7 +821,7 @@ The fractional seconds are omitted on hosts that do not support fractional time stamps. You can change the header's content with the -@option{--label=@var{label}} option; see @xref{Alternate Names}. +@option{--label=@var{label}} option. @xref{Alternate Names}. Next come one or more hunks of differences; each hunk shows one area where the files differ. Unified format hunks look like this: @@ -993,7 +993,7 @@ The corresponding lines differ, and only the second line is incomplete. @end table Normally, an output line is incomplete if and only if the lines that it -contains are incomplete; @xref{Incomplete Lines}. However, when an +contains are incomplete. @xref{Incomplete Lines}. However, when an output line represents two differing lines, one might be incomplete while the other is not. In this case, the output line is complete, but its the gutter is marked @samp{\} if the first line is incomplete, @@ -1708,7 +1708,7 @@ might contain duplicate or otherwise incorrect code. The @command{patch} @option{-D @var{name}} option behaves like the @command{diff} @option{-D @var{name}} option, except it operates on -a file and a diff to produce a merged file; @xref{patch Options}. +a file and a diff to produce a merged file. @xref{patch Options}. @node Incomplete Lines @chapter Incomplete Lines @@ -1727,10 +1727,10 @@ line by a following line that starts with @samp{\}. However, the @acronym{RCS} format (@pxref{RCS}) outputs the incomplete line as-is, without any trailing newline or following line. The side by side format normally represents incomplete lines as-is, but in some cases -uses a @samp{\} or @samp{/} gutter marker; @xref{Side by Side}. The +uses a @samp{\} or @samp{/} gutter marker. @xref{Side by Side}. The if-then-else line format preserves a line's incompleteness with -@samp{%L}, and discards the newline with @samp{%l}; @xref{Line -Formats}. Finally, with the @command{ed} and forward @command{ed} +@samp{%L}, and discards the newline with @samp{%l}. @xref{Line Formats}. +Finally, with the @command{ed} and forward @command{ed} output formats (@pxref{Output Formats}) @command{diff} cannot represent an incomplete line, so it pretends there was a newline and reports an error. @@ -1784,20 +1784,23 @@ subdirectories' files, but if you use the @option{-r} or @option{--recursive} option, it compares every corresponding pair of files in the directory trees, as many levels deep as they go. -For file names that are in only one of the directories, @command{diff} -normally does not show the contents of the file that exists; it reports -only that the file exists in that directory and not in the other. You -can make @command{diff} act as though the file existed but was empty in the -other directory, so that it outputs the entire contents of the file that +If only one file exists, @command{diff} normally does not show its +contents; it merely reports that one file exists but the other does +not. You can make @command{diff} act as though the missing file is +empty, so that it outputs the entire contents of the file that actually exists. (It is output as either an insertion or a -deletion, depending on whether it is in the first or the second -directory given.) To do this, use the @option{--new-file} (@option{-N}) -option. - -If the older directory contains one or more large files that are not in +deletion, depending on whether the missing file is in the first or the +second position.) To do this, use the @option{--new-file} +(@option{-N}) option. This option affects command-line arguments as +well as files found via directory traversal; for example, @samp{diff +-N a b} treats @file{a} as empty if @file{a} does not exist but +@file{b} does, and similarly @samp{diff -N - b} treats standard input +as empty if it is closed but @file{b} exists. + +If the older directory contains large files that are not in the newer directory, you can make the patch smaller by using the @option{--unidirectional-new-file} option instead of @option{-N}. -This option is like @option{-N} except that it only inserts the contents +This option is like @option{-N} except that it inserts the contents only of files that appear in the second directory but not the first (that is, files that were added). At the top of the patch, write instructions for the user applying the patch to remove the files that were deleted before @@ -1846,6 +1849,13 @@ is specified while the @option{--ignore-file-name-case} option is in effect, case is ignored when excluding file names matching the specified patterns. +To avoid that @command{diff} follows symbolic links, use the +@c later: @option{--no-dereference} (@option{-P}). +@option{--no-dereference}. +When this option is in use, +symbolic links will be treated like a special kind of files, rather than +comparing the target of each symbolic link. + @node Adjusting Output @chapter Making @command{diff} Output Prettier @@ -2004,8 +2014,8 @@ their location in the input files. @menu * Sample diff3 Input:: Sample @command{diff3} input for examples. * Example diff3 Normal:: Sample output in the normal format. -* diff3 Hunks:: The format of normal output format. * Detailed diff3 Normal:: A detailed description of normal output format. +* diff3 Hunks:: The format of normal output format. @end menu @node Sample diff3 Input @@ -3183,7 +3193,7 @@ characters. @c locale. @c @item locale @c @c Use @t instead of @samp to avoid duplicate quoting in some output styles. -@c Like @samp{clocale}, but quote @t{`like this'} instead of @t{"like +@c Like @samp{clocale}, but quote @t{'like this'} instead of @t{"like @c this"} in the default C locale. This looks nicer on many displays. @end table @@ -3553,6 +3563,9 @@ second. @itemx --verbose Output the (decimal) byte numbers and (octal) values of all differing bytes, instead of the default standard output. +Each output line contains a differing byte's number relative to the +start of the input, followed by the differing byte values. +Byte numbers start at 1. Also, output the @acronym{EOF} message if one file is shorter than the other. @item -n @var{count} @@ -3836,9 +3849,8 @@ specifies the number of lines affected. @xref{RCS}. @item -N @itemx --new-file -In directory comparison, if a file is found in only one directory, -treat it as present but empty in the other directory. @xref{Comparing -Directories}. +If one file is missing, treat it as present but empty. +@xref{Comparing Directories}. @item --new-group-format=@var{format} Use @var{format} to output a group of lines taken from just the second @@ -3848,6 +3860,9 @@ file in if-then-else format. @xref{Line Group Formats}. Use @var{format} to output a line taken from just the second file in if-then-else format. @xref{Line Formats}. +@item --no-dereference +Act on symbolic links themselves instead of what they point to. + @item --old-group-format=@var{format} Use @var{format} to output a group of lines taken from just the first file in if-then-else format. @xref{Line Group Formats}. @@ -3927,8 +3942,7 @@ Use @var{format} to output a line common to both files in if-then-else format. @xref{Line Formats}. @item --unidirectional-new-file -When comparing directories, if a file appears only in the second -directory of the two, treat it as present but empty in the other. +If a first file is missing, treat it as present but empty. @xref{Comparing Directories}. @item -U @var{lines} diff --git a/doc/fdl.texi b/doc/fdl.texi index fc19ddd..cb71f05 100644 --- a/doc/fdl.texi +++ b/doc/fdl.texi @@ -481,7 +481,7 @@ license notices just after the title page: @end smallexample If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts, -replace the ``with@dots{}Texts.'' line with this: +replace the ``with@dots{}Texts.''@: line with this: @smallexample @group @@ -503,4 +503,3 @@ to permit their use in free software. @c Local Variables: @c ispell-local-pdict: "ispell-dict" @c End: - diff --git a/doc/stamp-vti b/doc/stamp-vti index 3946f05..c18f5a1 100644 --- a/doc/stamp-vti +++ b/doc/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 15 August 2011 -@set UPDATED-MONTH August 2011 -@set EDITION 3.2 -@set VERSION 3.2 +@set UPDATED 23 March 2013 +@set UPDATED-MONTH March 2013 +@set EDITION 3.3 +@set VERSION 3.3 diff --git a/doc/version.texi b/doc/version.texi index 3946f05..c18f5a1 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 15 August 2011 -@set UPDATED-MONTH August 2011 -@set EDITION 3.2 -@set VERSION 3.2 +@set UPDATED 23 March 2013 +@set UPDATED-MONTH March 2013 +@set EDITION 3.3 +@set VERSION 3.3 |