Add Paul's ChangeLog for previous patch.

Restore the m4/.gitignore file I inadvertently removed.

2 files changed, 424 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 7244fa8e9..6f54ea1b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,168 @@
+2007-07-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* NEWS: pr -F no longer suppresses the footer or the first two blank
+	lines in the header.
+	* doc/coreutils.texi (pr invocation): Likewise.  Also, a too-short
+	page length implies -t, not -T.
+	* src/pr.c (lines_per_header, lines_per_footer): Now constants.
+	(init_parameters): Don't try to change them.
+	(print_header): Use the same header and footer format regardless of
+	wither form feeds are being used.
+	(usage): Adjust to above change when describing too-short page length.
+	Too-short page length impliesy -t, not -T.
+	* tests/pr/2-S_f-t_notab: Adjust to the fact that -F now affects
+	only formfeed handling; it does not change the header.
+	* tests/pr/2-Sf-t_notab: Likewise.
+	* tests/pr/2f-t_notab: Likewise.
+	* tests/pr/2s_f-t_notab: Likewise.
+	* tests/pr/2s_w60f-t_nota: Likewise.
+	* tests/pr/2sf-t_notab: Likewise.
+	* tests/pr/2sw60f-t_notab: Likewise.
+	* tests/pr/2w60f-t_notab: Likewise.
+	* tests/pr/3a3f-0F: Likewise.
+	* tests/pr/3b3f-0F: Likewise.
+	* tests/pr/3b3f-0FF: Likewise.
+	* tests/pr/3b3f-FF: Likewise.
+	* tests/pr/3f-0F: Likewise.
+	* tests/pr/3f-FF: Likewise.
+	* tests/pr/Test.pm: Likewise.
+	* tests/pr/a3f-0F: Likewise.
+	* tests/pr/a3f-0FF: Likewise.
+	* tests/pr/a3f-FF: Likewise.
+	* tests/pr/b3f-0F: Likewise.
+	* tests/pr/b3f-0FF: Likewise.
+	* tests/pr/b3f-FF: Likewise.
+	* tests/pr/3-5l17f-t: Remove, since it's been renamed to another
+	file whose name has a line count 7 larger,
+	reflecting the new line count needed for this behavior.
+	* tests/pr/3a3l8f-t: Likewise.
+	* tests/pr/3b3l8f-t: Likewise.
+	* tests/pr/3l17f-t: Likewise.
+	* tests/pr/3ml17f-t: Likewise.
+	* tests/pr/Ja3l17f-lm: Likewise.
+	* tests/pr/Jb3l17f-lm: Likewise.
+	* tests/pr/Jml17f-lm-lo: Likewise.
+	* tests/pr/W-72l17f-ll: Likewise.
+	* tests/pr/W20l17f-ll: Likewise.
+	* tests/pr/W26l17f-ll: Likewise.
+	* tests/pr/W27l17f-ll: Likewise.
+	* tests/pr/W28l17f-ll: Likewise.
+	* tests/pr/W35Ja3l17f-lm: Likewise.
+	* tests/pr/W35Jb3l17f-lm: Likewise.
+	* tests/pr/W35Jml17f-lmlo: Likewise.
+	* tests/pr/W35a3l17f-lm: Likewise.
+	* tests/pr/W35b3l17f-lm: Likewise.
+	* tests/pr/W35ml17f-lm-lo: Likewise.
+	* tests/pr/W72Jl17f-ll: Likewise.
+	* tests/pr/a3l17f-lm: Likewise.
+	* tests/pr/a3l8f-t: Likewise.
+	* tests/pr/b3l17f-lm: Likewise.
+	* tests/pr/b3l8f-t: Likewise.
+	* tests/pr/l17f-t: Likewise.
+	* tests/pr/ml17f-0F: Likewise.
+	* tests/pr/ml17f-lm-lo: Likewise.
+	* tests/pr/ml17f-t: Likewise.
+	* tests/pr/ml17f-t-0F: Likewise.
+	* tests/pr/n+2-5l17f-0FF: Likewise.
+	* tests/pr/n+2l17f-0FF: Likewise.
+	* tests/pr/n+2l17f-bl: Likewise.
+	* tests/pr/n+3l17f-0FF: Likewise.
+	* tests/pr/n+3l17f-bl: Likewise.
+	* tests/pr/n+3ml13f-bl-FF: Likewise.
+	* tests/pr/n+3ml17f-bl-tn: Likewise.
+	* tests/pr/n+3ml17f-tn-bl: Likewise.
+	* tests/pr/n+4b2l10f-0FF: Likewise.
+	* tests/pr/n+5-8b3l10f-FF: Likewise.
+	* tests/pr/n+5a3l6f-0FF: Likewise.
+	* tests/pr/n+6b3l6f-FF: Likewise.
+	* tests/pr/nJml17f-lmlmlo: Likewise.
+	* tests/pr/nJml17f-lmlolm: Likewise.
+	* tests/pr/nN1+3l17f-bl: Likewise.
+	* tests/pr/nN15l17f-bl: Likewise.
+	* tests/pr/nSml13-bl-FF: Likewise.
+	* tests/pr/nSml13-t-t-FF: Likewise.
+	* tests/pr/nSml13-t-tFFFF: Likewise.
+	* tests/pr/nSml17-bl-FF: Likewise.
+	* tests/pr/nSml17-t-t-FF: Likewise.
+	* tests/pr/nSml17-t-tFFFF: Likewise.
+	* tests/pr/nl17f-bl: Likewise.
+	* tests/pr/o3Jml17f-lm-lo: Likewise.
+	* tests/pr/o3a3Sl17f-tn: Likewise.
+	* tests/pr/o3a3Snl17f-tn: Likewise.
+	* tests/pr/o3a3l17f-tn: Likewise.
+	* tests/pr/o3b3Sl17f-tn: Likewise.
+	* tests/pr/o3b3Snl17f-tn: Likewise.
+	* tests/pr/o3b3l17f-tn: Likewise.
+	* tests/pr/o3mSl17f-bl-tn: Likewise.
+	* tests/pr/o3mSnl17fbltn: Likewise.
+	* tests/pr/o3ml17f-bl-tn: Likewise.
+	* tests/pr/w72l17f-ll: Likewise.
+	* tests/pr/3-5l24f-t: New file, containing the contents of the
+	file with the same name but with the line count smaller by 7,
+	reflecting the new behavior with -F.
+	* tests/pr/3a3l15f-t: Likewise.
+	* tests/pr/3b3l15f-t: Likewise.
+	* tests/pr/3l24f-t: Likewise.
+	* tests/pr/3ml24f-t: Likewise.
+	* tests/pr/Ja3l24f-lm: Likewise.
+	* tests/pr/Jb3l24f-lm: Likewise.
+	* tests/pr/Jml24f-lm-lo: Likewise.
+	* tests/pr/W-72l24f-ll: Likewise.
+	* tests/pr/W20l24f-ll: Likewise.
+	* tests/pr/W26l24f-ll: Likewise.
+	* tests/pr/W27l24f-ll: Likewise.
+	* tests/pr/W28l24f-ll: Likewise.
+	* tests/pr/W35Ja3l24f-lm: Likewise.
+	* tests/pr/W35Jb3l24f-lm: Likewise.
+	* tests/pr/W35Jml24f-lmlo: Likewise.
+	* tests/pr/W35a3l24f-lm: Likewise.
+	* tests/pr/W35b3l24f-lm: Likewise.
+	* tests/pr/W35ml24f-lm-lo: Likewise.
+	* tests/pr/W72Jl24f-ll: Likewise.
+	* tests/pr/a3l15f-t: Likewise.
+	* tests/pr/a3l24f-lm: Likewise.
+	* tests/pr/b3l15f-t: Likewise.
+	* tests/pr/b3l24f-lm: Likewise.
+	* tests/pr/l24f-t: Likewise.
+	* tests/pr/ml24f-0F: Likewise.
+	* tests/pr/ml24f-lm-lo: Likewise.
+	* tests/pr/ml24f-t: Likewise.
+	* tests/pr/ml24f-t-0F: Likewise.
+	* tests/pr/n+2-5l24f-0FF: Likewise.
+	* tests/pr/n+2l24f-0FF: Likewise.
+	* tests/pr/n+2l24f-bl: Likewise.
+	* tests/pr/n+3l24f-0FF: Likewise.
+	* tests/pr/n+3l24f-bl: Likewise.
+	* tests/pr/n+3ml20f-bl-FF: Likewise.
+	* tests/pr/n+3ml24f-bl-tn: Likewise.
+	* tests/pr/n+3ml24f-tn-bl: Likewise.
+	* tests/pr/n+4b2l17f-0FF: Likewise.
+	* tests/pr/n+5-8b3l17f-FF: Likewise.
+	* tests/pr/n+5a3l13f-0FF: Likewise.
+	* tests/pr/n+6b3l13f-FF: Likewise.
+	* tests/pr/nJml24f-lmlmlo: Likewise.
+	* tests/pr/nJml24f-lmlolm: Likewise.
+	* tests/pr/nN1+3l24f-bl: Likewise.
+	* tests/pr/nN15l24f-bl: Likewise.
+	* tests/pr/nSml20-bl-FF: Likewise.
+	* tests/pr/nSml20-t-t-FF: Likewise.
+	* tests/pr/nSml20-t-tFFFF: Likewise.
+	* tests/pr/nSml24-bl-FF: Likewise.
+	* tests/pr/nSml24-t-t-FF: Likewise.
+	* tests/pr/nSml24-t-tFFFF: Likewise.
+	* tests/pr/nl24f-bl: Likewise.
+	* tests/pr/o3Jml24f-lm-lo: Likewise.
+	* tests/pr/o3a3Sl24f-tn: Likewise.
+	* tests/pr/o3a3Snl24f-tn: Likewise.
+	* tests/pr/o3a3l24f-tn: Likewise.
+	* tests/pr/o3b3Sl24f-tn: Likewise.
+	* tests/pr/o3b3Snl24f-tn: Likewise.
+	* tests/pr/o3b3l24f-tn: Likewise.
+	* tests/pr/o3mSl24f-bl-tn: Likewise.
+	* tests/pr/o3mSnl24fbltn: Likewise.
+	* tests/pr/o3ml24f-bl-tn: Likewise.
+	* tests/pr/w72l24f-ll: Likewise.
+
 2007-06-23  Jim Meyering  <jim@meyering.net>
 
 	Prefer "STREQ (a, b)" over "strcmp (a, b) == 0"; similar for != 0.
diff --git a/m4/.gitignore b/m4/.gitignore
new file mode 100644
index 000000000..a10566a9e
--- /dev/null
+++ b/m4/.gitignore
@@ -0,0 +1,259 @@
+absolute-header.m4
+acl.m4
+alloca.m4
+argmatch.m4
+arpa_inet_h.m4
+assert.m4
+atexit.m4
+autobuild.m4
+backupfile.m4
+base64.m4
+bison.m4
+c-strtod.m4
+calloc.m4
+canon-host.m4
+canonicalize.m4
+chdir-long.m4
+chown.m4
+clock_time.m4
+cloexec.m4
+close-stream.m4
+closeout.m4
+codeset.m4
+config-h.m4
+cycle-check.m4
+d-ino.m4
+d-type.m4
+dirfd.m4
+dirname.m4
+dos.m4
+double-slash-root.m4
+dup2.m4
+eaccess.m4
+eealloc.m4
+eoverflow.m4
+error.m4
+euidaccess.m4
+exclude.m4
+exitfail.m4
+extensions.m4
+fchdir.m4
+fcntl-safer.m4
+fcntl_h.m4
+file-type.m4
+fileblocks.m4
+filemode.m4
+filenamecat.m4
+findprog.m4
+flexmember.m4
+float_h.m4
+fnmatch.m4
+fpending.m4
+fprintftime.m4
+free.m4
+fseeko.m4
+fstypename.m4
+fsusage.m4
+ftello.m4
+ftruncate.m4
+fts.m4
+getaddrinfo.m4
+getcwd-abort-bug.m4
+getcwd-path-max.m4
+getcwd.m4
+getdate.m4
+getdelim.m4
+getgroups.m4
+gethostname.m4
+gethrxtime.m4
+getline.m4
+getloadavg.m4
+getndelim2.m4
+getopt.m4
+getpagesize.m4
+getpass.m4
+gettext.m4
+gettime.m4
+gettimeofday.m4
+getugroups.m4
+getusershell.m4
+glibc21.m4
+gnulib-cache.m4
+gnulib-common.m4
+gnulib-comp.m4
+gnulib-tool.m4
+group-member.m4
+hard-locale.m4
+hash.m4
+host-os.m4
+human.m4
+i-ring.m4
+iconv.m4
+iconv_h.m4
+iconv_open.m4
+idcache.m4
+inet_ntop.m4
+inline.m4
+intl.m4
+intldir.m4
+intlmacosx.m4
+intmax.m4
+intmax_t.m4
+inttostr.m4
+inttypes-h.m4
+inttypes-pri.m4
+inttypes.m4
+inttypes_h.m4
+isapipe.m4
+jm-winsz1.m4
+jm-winsz2.m4
+lchmod.m4
+lchown.m4
+lib-ignore.m4
+lib-ld.m4
+lib-link.m4
+lib-prefix.m4
+link-follow.m4
+localcharset.m4
+long-options.m4
+longdouble.m4
+longlong.m4
+ls-mntd-fs.m4
+lseek.m4
+lstat.m4
+malloca.m4
+mbchar.m4
+mbiter.m4
+mbrtowc.m4
+mbscasecmp.m4
+mbstate_t.m4
+mbswidth.m4
+md5.m4
+memcasecmp.m4
+memchr.m4
+memcmp.m4
+memcoll.m4
+memcpy.m4
+memmove.m4
+mempcpy.m4
+memrchr.m4
+memset.m4
+mkancesdirs.m4
+mkdir-p.m4
+mkdir-slash.m4
+mkstemp.m4
+mktime.m4
+modechange.m4
+mountlist.m4
+mpsort.m4
+nanosleep.m4
+netinet_in_h.m4
+nls.m4
+openat.m4
+pathmax.m4
+perl.m4
+physmem.m4
+po.m4
+posixtm.m4
+posixver.m4
+printf-posix.m4
+progtest.m4
+putenv.m4
+quote.m4
+quotearg.m4
+readlink.m4
+readtokens.m4
+readutmp.m4
+regex.m4
+rename-dest-slash.m4
+rename.m4
+rmdir-errno.m4
+rmdir.m4
+root-dev-ino.m4
+rpmatch.m4
+safe-read.m4
+safe-write.m4
+same.m4
+save-cwd.m4
+savedir.m4
+savewd.m4
+selinux-context-h.m4
+selinux-selinux-h.m4
+setenv.m4
+settime.m4
+sha1.m4
+sig2str.m4
+signed.m4
+size_max.m4
+snprintf.m4
+socklen.m4
+sockpfaf.m4
+ssize_t.m4
+st_dm_mode.m4
+stat-macros.m4
+stat-time.m4
+stdarg.m4
+stdbool.m4
+stdint.m4
+stdint_h.m4
+stdio-safer.m4
+stdio_h.m4
+stdlib-safer.m4
+stdlib_h.m4
+stpcpy.m4
+strcase.m4
+strcspn.m4
+strdup.m4
+strftime.m4
+string_h.m4
+strndup.m4
+strnlen.m4
+strpbrk.m4
+strtod.m4
+strtoimax.m4
+strtol.m4
+strtoll.m4
+strtoul.m4
+strtoull.m4
+strtoumax.m4
+strverscmp.m4
+sys_socket_h.m4
+sys_stat_h.m4
+sys_time_h.m4
+tempname.m4
+time_h.m4
+time_r.m4
+timespec.m4
+tm_gmtoff.m4
+tzset.m4
+unicodeio.m4
+unistd-safer.m4
+unistd_h.m4
+unlink-busy.m4
+unlinkdir.m4
+unlocked-io.m4
+uptime.m4
+userspec.m4
+utimbuf.m4
+utime.m4
+utimecmp.m4
+utimens.m4
+utimes-null.m4
+utimes.m4
+vasnprintf.m4
+vasprintf.m4
+wchar.m4
+wchar_t.m4
+wctype.m4
+wcwidth.m4
+wint_t.m4
+write-any-file.m4
+xalloc.m4
+xgetcwd.m4
+xnanosleep.m4
+xreadlink.m4
+xsize.m4
+xstrndup.m4
+xstrtod.m4
+xstrtol.m4
+yesno.m4