moved stuff since 4.2.0 back into ChangeLog

2 files changed, 71 insertions, 69 deletions

diff --git a/ChangeLog b/ChangeLog
index c391f3d75..f772824f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,76 @@
 2004-04-05  Peter Stephenson  <pws@csr.com>
 
+	* unposted: ChangeLog, ChangeLog-4.1: move stuff up to 4.2.0
+	out of ChangeLog.
+
 	* unposted: Config/version.mk: update version to 4.2.0-dev-1;
 	not tagged or released, this is just to 
 
+2004-04-01  Peter Stephenson  <pws@pwstephenson.fsnet.co.uk>
+
+	* 19717: Doc/Zsh/expn.y, Src/glob.c: use F glob qualifier
+	for `full' (non-empty) directories.
+
+2004-03-31  Bart Schaefer  <schaefer@zsh.org>
+
+	* unposted: Functions/Misc/zrecompile: change "mv" to "mv -f"
+	when backing up .zwc files, because zcompile creates the files
+	read-only.  See thread ending at users/7269.
+
+2004-03-30  Oliver Kiddle  <opk@zsh.org>
+
+	* 19708: Completion/compaudit: change getent() function to
+	handle two arguments
+
+	* 19707: Src/params.c, Test/D05array.ztst: fix bug where a
+	nagative index into an array returned a one element array
+	instead of a scalar
+
+2004-03-25  Clint Adams  <clint@zsh.org>
+
+	* 19691: Completion/Unix/Type/_diff_options: Allow more than
+	one --exclude or -x to diff.
+
+2004-03-25  Peter Stephenson  <pws@csr.com>
+
+	* 19683: Src/utils.c: Work around occasional problem on
+	Cygwin with dllwrap.
+
+	* 19682: Doc/Zsh/builtins.yo, Etc/NEWS, Src/signals.c: Don't
+	run ZERR, DEBUG or EXIT traps inside other traps; caused confusion
+	and incompatibility.
+
+2004-03-24  Peter Stephenson  <pws@csr.com>
+
+	* 19674 plus unposted changes suggested in 19676:
+	configure.ac, Doc/Zsh/mod_zftp.yo, Src/Modules/zftp.c,
+	Etc/NEWS, Functions/Zftp/zfstat: Add support for non-standard
+	ports to core zftp.  Not yet handled by the function system
+	(except zfstat reports port): needed in lastloc	and bookmarks.
+
+2004-03-23  Peter Stephenson  <pws@csr.com>
+
+	* 19661: Danek Duvall: Completion/Unix/Type/_diff_options:
+	support diff -u on Solaris from 2.10 up.
+
+2004-03-22  Clint Adams  <clint@zsh.org>
+
+	* 19673: Peter Palfrader: Completion/Unix/Command/_cvs:
+	tags can contain the + character.
+
+2004-03-22  Peter Stephenson  <pws@pwstephenson.fsnet.co.uk>
+
+	* 19669, 19670: Danek Duvall: Completion/compaudit: Use of
+	getent to check groups was slow; typo caused duplicate fpath
+	entries.
+
+	* 19671: Src/Zle/zle_main.c: error in zle-line-init caused
+	infinite loop.
+
+2004-03-20  Bart Schaefer  <schaefer@zsh.org>
+
+	* 19666 (tweaked): Completion/Unix/Command/_ssh: fixes for remote
+	file completion for scp, suggested by Jay Berkenbilt <ejb@ql.org>.
+
+	* users/7172: Functions/Prompts/prompt_bart_setup: include "unset"
+	among the localoptions, as this relies on it.
diff --git a/ChangeLog-4.1 b/ChangeLog-4.1
index 9de5f73de..a128d6a70 100644
--- a/ChangeLog-4.1
+++ b/ChangeLog-4.1
@@ -1,72 +1,3 @@
-2004-04-01  Peter Stephenson  <pws@pwstephenson.fsnet.co.uk>
-
-	* 19717: Doc/Zsh/expn.y, Src/glob.c: use F glob qualifier
-	for `full' (non-empty) directories.
-
-2004-03-31  Bart Schaefer  <schaefer@zsh.org>
-
-	* unposted: Functions/Misc/zrecompile: change "mv" to "mv -f"
-	when backing up .zwc files, because zcompile creates the files
-	read-only.  See thread ending at users/7269.
-
-2004-03-30  Oliver Kiddle  <opk@zsh.org>
-
-	* 19708: Completion/compaudit: change getent() function to
-	handle two arguments
-
-	* 19707: Src/params.c, Test/D05array.ztst: fix bug where a
-	nagative index into an array returned a one element array
-	instead of a scalar
-
-2004-03-25  Clint Adams  <clint@zsh.org>
-
-	* 19691: Completion/Unix/Type/_diff_options: Allow more than
-	one --exclude or -x to diff.
-
-2004-03-25  Peter Stephenson  <pws@csr.com>
-
-	* 19683: Src/utils.c: Work around occasional problem on
-	Cygwin with dllwrap.
-
-	* 19682: Doc/Zsh/builtins.yo, Etc/NEWS, Src/signals.c: Don't
-	run ZERR, DEBUG or EXIT traps inside other traps; caused confusion
-	and incompatibility.
-
-2004-03-24  Peter Stephenson  <pws@csr.com>
-
-	* 19674 plus unposted changes suggested in 19676:
-	configure.ac, Doc/Zsh/mod_zftp.yo, Src/Modules/zftp.c,
-	Etc/NEWS, Functions/Zftp/zfstat: Add support for non-standard
-	ports to core zftp.  Not yet handled by the function system
-	(except zfstat reports port): needed in lastloc	and bookmarks.
-
-2004-03-23  Peter Stephenson  <pws@csr.com>
-
-	* 19661: Danek Duvall: Completion/Unix/Type/_diff_options:
-	support diff -u on Solaris from 2.10 up.
-
-2004-03-22  Clint Adams  <clint@zsh.org>
-
-	* 19673: Peter Palfrader: Completion/Unix/Command/_cvs:
-	tags can contain the + character.
-
-2004-03-22  Peter Stephenson  <pws@pwstephenson.fsnet.co.uk>
-
-	* 19669, 19670: Danek Duvall: Completion/compaudit: Use of
-	getent to check groups was slow; typo caused duplicate fpath
-	entries.
-
-	* 19671: Src/Zle/zle_main.c: error in zle-line-init caused
-	infinite loop.
-
-2004-03-20  Bart Schaefer  <schaefer@zsh.org>
-
-	* 19666 (tweaked): Completion/Unix/Command/_ssh: fixes for remote
-	file completion for scp, suggested by Jay Berkenbilt <ejb@ql.org>.
-
-	* users/7172: Functions/Prompts/prompt_bart_setup: include "unset"
-	among the localoptions, as this relies on it.
-
 2004-03-19  Peter Stephenson  <pws@csr.com>
 
 	* unposted: Config/version.mk, Etc/NEWS, Util/.distfiles: