This commit was generated by cvs2svn to compensate for changes in r29, which

included commits to RCS files with non-trunk default branches.

diff --git a/etc/NEWS b/etc/NEWS
index ffd4989..7190dbd 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -33,7 +33,7 @@ file.
 * Changes in XEmacs 21.2
 ========================
 
-*** You can now create an "indirect buffer", like in GNU Emacs.  An
+** You can now create "indirect buffers", like in GNU Emacs.  An
 indirect buffer shares its text with another buffer ("base buffer"),
 but has its own major mode, local variables, extents, and narrowing.
 An indirect buffer has a name of its own, distinct from those of the
@@ -53,9 +53,13 @@ its base buffer.  It returns nil when given an ordinary buffer (not
 indirect).  `buffer-indirect-children' returns a list of the indirect
 children of a base buffer.
 
-#### The library `noutline' has versions of Outline mode and Outline
-minor mode which let you display different parts of the outline in
-different indirect buffers.
+\f
+* Lisp and internal changes in XEmacs 21.0
+==========================================
+
+** Functions for decoding base64 encoding are now available; see
+`base64-encode-region', `base64-encode-string', `base64-decode-region'
+and `base64-decode-string'.
 
 \f
 * Changes in XEmacs 21.0

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 927c3e1..d3738c9 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,20 @@
+1998-11-28  SL Baur  <steve@altair.xemacs.org>
+
+       * XEmacs 21.2-beta4 is released.
+
+1998-10-14  Andy Piper  <andyp@parallax.co.uk>
+
+       * Makefile.in.in (movemail): add getopt.o to objects to link with.
+
+       * movemail.c (main): rewrite to use getopt(). Add options for
+       order reversal, progress output, regexp matching and message
+       deletion.
+       (popmail): add some optional verbose messages. Use pop_search_top
+       for getting messages. Make message deletion optional. Delete all
+       messages at the end rather than on a message my message basis.
+       (pop_search_top): new function. Looks for messages matching regexp.
+       (compile_regex): new function stolen from etags.
+
 1998-10-15  SL Baur  <steve@altair.xemacs.org>
 
        * XEmacs 21.2-beta3 is released.

diff --git a/lib-src/Makefile.in.in b/lib-src/Makefile.in.in
index d3df934..fcc6f86 100644 (file)
--- a/lib-src/Makefile.in.in
+++ b/lib-src/Makefile.in.in
@@ -310,8 +310,10 @@ sorted-doc: ${srcdir}/sorted-doc.c
 b2m: ${srcdir}/b2m.c ../src/config.h
        $(CC) $(cflags) ${srcdir}/b2m.c $(ldflags) -o $@
 
-movemail: ${srcdir}/movemail.c ${srcdir}/pop.c ${srcdir}/pop.h ../src/config.h
-       $(CC) $(cflags) ${MOVE_FLAGS} ${srcdir}/movemail.c ${srcdir}/pop.c $(ldflags) ${MOVE_LIBS} -o $@
+movemail: ${srcdir}/movemail.c ${srcdir}/pop.c ${srcdir}/pop.h $(GETOPTDEPS) regex.o \
+       ../src/config.h
+       $(CC) $(cflags) ${MOVE_FLAGS} ${srcdir}/movemail.c ${srcdir}/pop.c \
+       $(GETOPTOBJS) regex.o $(ldflags) ${MOVE_LIBS} -o $@
 
 cvtmail: ${srcdir}/cvtmail.c
        $(CC) $(cflags) ${srcdir}/cvtmail.c $(ldflags) -o $@

diff --git a/version.sh b/version.sh
index 86e51b4..6fd893a 100644 (file)
--- a/version.sh
+++ b/version.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 emacs_major_version=21
 emacs_minor_version=2
-emacs_beta_version=3
-xemacs_codename="Aglaia"
+emacs_beta_version=4
+xemacs_codename="Aglaophonos"
 infodock_major_version=4
 infodock_minor_version=0
 infodock_build_version=1