PATCH: prepare for 4.2.1

[Peter Stephenson <pws@xxxxxxx>]

This is in preparation for the next release.

I wrote it on the assumption that we were taking up Oliver's suggestion
of re-expanding the prompt when the line editor is interrupted and
restarted, but it looks like Wayne's patch actually more or less makes
reset-prompt redundant by doing it on all refreshes (which seems like
overkill).  Testing trashedzle might be a better bet.  (I can have a go
at that.)

Oliver suggested moving some stuff.  I will move NEWS and FEATURES into
the top directory (and change the .distfiles) when I commit this.

Index: .distfiles
===================================================================
RCS file: /cvsroot/zsh/zsh/.distfiles,v
retrieving revision 1.7
diff -u -r1.7 .distfiles
--- .distfiles	26 Feb 2004 15:09:07 -0000	1.7
+++ .distfiles	2 Jul 2004 15:05:59 -0000
@@ -1,6 +1,7 @@
 DISTFILES_SRC='
     .cvsignore .distfiles .preconfig Makefile.in
-    ChangeLog ChangeLog-3.1 ChangeLog.3.0 INSTALL LICENCE META-FAQ README
+    ChangeLog ChangeLog-3.1 ChangeLog.3.0 ChangeLog-4.1
+    INSTALL LICENCE META-FAQ README
     aclocal.m4 aczsh.m4 configure.ac
     configure config.h.in stamp-h.in
     config.guess config.sub install-sh mkinstalldirs 
Index: README
===================================================================
RCS file: /cvsroot/zsh/zsh/README,v
retrieving revision 1.15
diff -u -r1.15 README
--- README	26 Feb 2004 15:09:09 -0000	1.15
+++ README	2 Jul 2004 15:05:59 -0000
@@ -5,7 +5,7 @@
 Version
 -------
 
-This is zsh version 4.2.0.  This is a stable release.
+This is zsh version 4.2.1.  This is a stable release.
 
 Installing Zsh
 --------------
@@ -18,12 +18,20 @@
 --------
 
 Zsh is a shell with lots of features.  For a list of some of these, see the
-file Etc/FEATURES, and for the latest changes see Etc/NEWS.  For more
+file FEATURES, and for the latest changes see NEWS.  For more
 details, see the documentation.
 
 Possible incompatibilities
 ---------------------------
 
+Currently the only known incompatibilities between 4.2.0 and later
+versions are minor: IPv6 addresses must be specified in
+square brackets in the zftp module and function system; special
+traps for pseudosignals ZERR, DEBUG and EXIT are no longer executed
+inside other traps (users may well have assumed this was the case anyway
+since the behaviour was not explicity documented).  See the NEWS file for
+more detail.
+
 Some particular differences you may notice since version 4.0:
 
 The bash-compatibility zle functions described in the zshcontrib manual
Index: Etc/NEWS
===================================================================
RCS file: /cvsroot/zsh/zsh/Etc/NEWS,v
retrieving revision 1.16
diff -u -r1.16 NEWS
--- Etc/NEWS	19 Apr 2004 16:02:22 -0000	1.16
+++ Etc/NEWS	2 Jul 2004 15:06:00 -0000
@@ -5,6 +5,23 @@
 Changes since zsh version 4.2.0
 -------------------------------
 
+- A new `try block' and `always block' syntax has been introduced
+  to make it easier to ensure the shell runs important tidy-up code
+  in the event of an error.  It also runs after a break, continue, or
+  return, including a return forced by the ERR_RETURN option,
+  but not an exit, which is immediate).  The syntax is:
+    `{'  try-block-list `}' `always' `{' always-block-list `}'
+  where no newline or semicolon may appear between `}' and `always'.
+  This is compatible with all previous valid zsh syntax as an `always'
+  at that point used to be a syntax error.  For example,
+    { echo Code run in current shell } always { echo Tidy-up code }
+
+- A new zle widget reset-prompt has been added to re-expand the current
+  prompt.  Note that this does not take account of changes to the
+  prompt variables themselves, only the expansion of the text.  The
+  same effect is now forced by a job change notification, making
+  the %j prompt escape and %(j..) ternary expression more useful.
+
 - The zftp module supports ports following the hostname in the normal suffix
   notation, `host:port'.  This requires IPv6 colon-style addresses to be
   specified in suitably quoted square brackets, for example:
Index: Test/.distfiles
===================================================================
RCS file: /cvsroot/zsh/zsh/Test/.distfiles,v
retrieving revision 1.15
diff -u -r1.15 .distfiles
--- Test/.distfiles	26 Mar 2003 17:33:40 -0000	1.15
+++ Test/.distfiles	2 Jul 2004 15:06:01 -0000
@@ -9,5 +9,6 @@
 A05execution.ztst    D02glob.ztst         Y01completion.ztst
 D06subscript.ztst    V01zmodload.ztst     E01options.ztst
 B02typeset.ztst      B03print.ztst        A06assign.ztst       B04read.ztst
+V03mathfunc.ztst
 README
 '

-- 
Peter Stephenson <pws@xxxxxxx>                  Software Engineer
CSR Ltd., Science Park, Milton Road,
Cambridge, CB4 0WH, UK                          Tel: +44 (0)1223 692070


**********************************************************************
This email and any files transmitted with it are confidential and
intended solely for the use of the individual or entity to whom they
are addressed. If you have received this email in error please notify
the system manager.

This footnote also confirms that this email message has been swept by
MIMEsweeper for the presence of computer viruses.

www.mimesweeper.com
**********************************************************************