XEmacs 21.2.15 "Sakuragawa".

diff --git a/CHANGES-beta b/CHANGES-beta
index 6cea377..e8dcf06 100644 (file)
--- a/CHANGES-beta
+++ b/CHANGES-beta
@@ -1,7 +1,14 @@
                                                        -*- indented-text -*-
 to 21.2.15 "Sakuragawa"
                                                        -*- indented-text -*-
 to 21.2.15 "Sakuragawa"

+-- new self tests from Oscar Figueiredo and Hrvoje Niksic
+-- Miscellaneous bug fixes from Yoshiki Hayashi, Jerry James, Hirokazu FUKUI,
+   Hrvoje Niksic, MORIOKA Tomohiko
+-- LDAP internationalization from Oscar Figueiredo
+-- DEC OSF build fixes from Steve Baur
+-- Documentation fixes from Mike McEwan, Vin Shelton and Gunnar Evermann
+-- Build fixes from Jan Vroonhof

 -- Miscellaneous fixes from Hrvoje Niksic
 -- Miscellaneous fixes from Hrvoje Niksic

--- Documentation updates from Hrvoje Niksic
+-- Documentation updates from Hrvoje Niksic and Albert Chin-A-Young

 -- mule-charset.el synch with Mule from Steve Baur
 -- miscellaneous build and cosmetic fixes from Steve Baur
 -- font-menu for mswindows from Andy Piper
 -- mule-charset.el synch with Mule from Steve Baur
 -- miscellaneous build and cosmetic fixes from Steve Baur
 -- font-menu for mswindows from Andy Piper

diff --git a/ChangeLog b/ChangeLog
index c7da4c3..647e5bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+1999-06-04  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+       * XEmacs 21.2.15 is released
+
+1999-06-01  Gunnar Evermann  <ge204@eng.cam.ac.uk>
+
+       * README.packages: fix typos: user pacakge hierarchy is ~/.xemacs
+       From: Eric Veldhuyzen <eric@terra.nu>
+

 1999-05-25  Jan Vroonhof  <jan@xemacs.org>
 
        * configure.in: For non-beta's use x.y.z format for version strings.
 1999-05-25  Jan Vroonhof  <jan@xemacs.org>
 
        * configure.in: For non-beta's use x.y.z format for version strings.

diff --git a/README.packages b/README.packages
index 014eb00..2ab2262 100644 (file)
--- a/README.packages
+++ b/README.packages
@@ -213,10 +213,10 @@ User Package directories
 ------------------------
 
 In addition to the system wide packages, each user can have his own
 ------------------------
 
 In addition to the system wide packages, each user can have his own

-packages installed in "./xemacs" (Note that this will most likely
-change to "./xemacs/packages" in the near future). If you want to
+packages installed in "~/.xemacs" (Note that this will most likely
+change to "~/.xemacs/packages" in the near future). If you want to

 install packages there using the interactive tools, you need to set
 install packages there using the interactive tools, you need to set

-'pui-package-install-dest-dir' to "/xemacs"
+'pui-package-install-dest-dir' to "~/xemacs"

 
 Site lisp/Site start
 --------------------
 
 Site lisp/Site start
 --------------------

diff --git a/dynodump/_dynodump.h b/dynodump/_dynodump.h
index 847c4eb..c09bd7f 100644 (file)
--- a/dynodump/_dynodump.h
+++ b/dynodump/_dynodump.h
@@ -32,7 +32,7 @@
  * Mountain View, California 94043
  */
 
  * Mountain View, California 94043
  */
 

-#pragma ident  "@(#) $Id: _dynodump.h,v 1.3 1997/05/29 04:22:29 steve Exp $ - SMI"
+#pragma ident  "@(#) $Id: _dynodump.h,v 1.5 1996/05/23 18:39:07 georgn Exp $ - SMI"

 
 #ifndef        _DYNODUMP_DOT_H
 #define        _DYNODUMP_DOT_H
 
 #ifndef        _DYNODUMP_DOT_H
 #define        _DYNODUMP_DOT_H

diff --git a/dynodump/dynodump.c b/dynodump/dynodump.c
index ff4477d..b684813 100644 (file)
--- a/dynodump/dynodump.c
+++ b/dynodump/dynodump.c
@@ -73,7 +73,7 @@
  * N.B. The above commentary is not quite correct in the flags have been hardwired
  *      to RTLD_SAVREL.
  */
  * N.B. The above commentary is not quite correct in the flags have been hardwired
  *      to RTLD_SAVREL.
  */

-#pragma ident  "@(#) $Id: dynodump.c,v 1.6 1998/03/31 20:10:55 steve Exp $ - SMI"
+#pragma ident  "@(#) $Id: dynodump.c,v 1.8 1996/05/23 18:39:21 georgn Exp $ - SMI"

 
 #define __EXTENSIONS__ 1
 
 
 #define __EXTENSIONS__ 1
 

diff --git a/dynodump/i386/_relocate.c b/dynodump/i386/_relocate.c
index f97dd1b..d3ec59c 100644 (file)
--- a/dynodump/i386/_relocate.c
+++ b/dynodump/i386/_relocate.c
@@ -32,7 +32,7 @@
  * Mountain View, California 94043
  */
 
  * Mountain View, California 94043
  */
 

-#pragma ident  "@(#) $Id: _relocate.c,v 1.3 1997/05/29 04:23:02 steve Exp $ - SMI"
+#pragma ident  "@(#) $Id: _relocate.c,v 1.4 1995/06/26 20:12:41 georgn Exp $ - SMI"

 
 /* LINTLIBRARY */
 
 
 /* LINTLIBRARY */
 

diff --git a/dynodump/i386/machdep.h b/dynodump/i386/machdep.h
index 4dc66fe..c90e29c 100644 (file)
--- a/dynodump/i386/machdep.h
+++ b/dynodump/i386/machdep.h
@@ -32,7 +32,7 @@
  * Mountain View, California 94043
  */
 
  * Mountain View, California 94043
  */
 

-#pragma ident  "@(#) $Id: machdep.h,v 1.3 1997/05/29 04:23:02 steve Exp $ - SMI"
+#pragma ident  "@(#) $Id: machdep.h,v 1.2 1995/02/16 22:58:43 georgn Exp $ - SMI"

 
 /*
  * Global include file for all sgs Intel machine dependent macros, constants
 
 /*
  * Global include file for all sgs Intel machine dependent macros, constants

diff --git a/dynodump/ppc/_relocate.c b/dynodump/ppc/_relocate.c
index 754b417..feb5ca9 100644 (file)
--- a/dynodump/ppc/_relocate.c
+++ b/dynodump/ppc/_relocate.c
@@ -32,7 +32,7 @@
  * Mountain View, California 94043
  */
 
  * Mountain View, California 94043
  */
 

-#pragma ident "@(#) $Id: _relocate.c,v 1.4 1998/03/31 20:10:55 steve Exp $ - SMI"
+#pragma ident "@(#) $Id: _relocate.c,v 1.3 1995/06/26 20:16:39 georgn Exp $ - SMI"

 
 /* LINTLIBRARY */
 
 
 /* LINTLIBRARY */
 

diff --git a/dynodump/ppc/machdep.h b/dynodump/ppc/machdep.h
index a649a9c..2a3d1e6 100644 (file)
--- a/dynodump/ppc/machdep.h
+++ b/dynodump/ppc/machdep.h
@@ -32,7 +32,7 @@
  * Mountain View, California 94043
  */
 
  * Mountain View, California 94043
  */
 

-#pragma ident "@(#) $Id: machdep.h,v 1.3 1997/05/29 04:23:20 steve Exp $ - SMI"
+#pragma ident "@(#) $Id: machdep.h,v 1.2 1995/02/16 22:58:49 georgn Exp $ - SMI"

 
 /*
  * Global include file for all sgs PowerPC machine dependent macros, constants
 
 /*
  * Global include file for all sgs PowerPC machine dependent macros, constants

diff --git a/dynodump/sparc/_relocate.c b/dynodump/sparc/_relocate.c
index 14466f0..10b0fda 100644 (file)
--- a/dynodump/sparc/_relocate.c
+++ b/dynodump/sparc/_relocate.c
@@ -35,7 +35,7 @@
 /*
  * Update the value of the `_edata' and `_end' symbols.
  */
 /*
  * Update the value of the `_edata' and `_end' symbols.
  */

-#pragma ident  "@(#) $Id: _relocate.c,v 1.4 1998/03/31 20:10:55 steve Exp $ - SMI"
+#pragma ident  "@(#) $Id: _relocate.c,v 1.4 1995/06/26 20:13:26 georgn Exp $ - SMI"

 
 #include       <libelf.h>
 #include       <string.h>
 
 #include       <libelf.h>
 #include       <string.h>

diff --git a/dynodump/sparc/machdep.h b/dynodump/sparc/machdep.h
index b4b76d8..972081e 100644 (file)
--- a/dynodump/sparc/machdep.h
+++ b/dynodump/sparc/machdep.h
@@ -32,7 +32,7 @@
  * Mountain View, California 94043
  */
 
  * Mountain View, California 94043
  */
 

-#pragma ident  "@(#) $Id: machdep.h,v 1.3 1997/05/29 04:23:26 steve Exp $ - SMI"
+#pragma ident  "@(#) $Id: machdep.h,v 1.2 1995/02/16 22:58:55 georgn Exp $ - SMI"

 
 /*
  * Global include file for all sgs SPARC machine dependent macros, constants
 
 /*
  * Global include file for all sgs SPARC machine dependent macros, constants

diff --git a/dynodump/syms.c b/dynodump/syms.c
index 0ac5cb8..c060f33 100644 (file)
--- a/dynodump/syms.c
+++ b/dynodump/syms.c
@@ -35,7 +35,7 @@
 /*
  * Update the value of the `_edata' and `_end' symbols.
  */
 /*
  * Update the value of the `_edata' and `_end' symbols.
  */

-#pragma ident  "@(#) $Id: syms.c,v 1.3 1997/05/29 04:22:30 steve Exp $ - SMI"
+#pragma ident  "@(#) $Id: syms.c,v 1.2 1995/03/06 22:39:22 georgn Exp $ - SMI"

 
 #include       <libelf.h>
 #include       <string.h>
 
 #include       <libelf.h>
 #include       <string.h>

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 778381a..c8fe1c9 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+1999-06-04  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+       * XEmacs 21.2.15 is released
+

 1999-06-03  SL Baur  <steve@steve1.m17n.org>
 
        * Makefile.in.in: Move .PHONY up to force execution of `all'.
 1999-06-03  SL Baur  <steve@steve1.m17n.org>
 
        * Makefile.in.in: Move .PHONY up to force execution of `all'.

diff --git a/lib-src/rcs2log b/lib-src/rcs2log
index 8fa12d9..2a9e7d1 100755 (executable)
--- a/lib-src/rcs2log
+++ b/lib-src/rcs2log
@@ -28,7 +28,7 @@ Options:
 
 Report bugs to <bug-gnu-emacs@prep.ai.mit.edu>.'
 
 
 Report bugs to <bug-gnu-emacs@prep.ai.mit.edu>.'
 

-Id='$Id: rcs2log,v 1.2 1997/07/09 04:31:03 steve Exp $'
+Id='$Id: rcs2log,v 1.37 1997/03/21 22:19:30 eggert Exp $'

 
 # Copyright 1992, 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
 
 
 # Copyright 1992, 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
 

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 513d601..a0a99f2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+1999-06-04  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+       * XEmacs 21.2.15 is released
+
+1999-06-02  Oscar Figueiredo  <oscar@xemacs.org>
+
+       * subr.el (split-string): Avoid infinite looping
+

 1999-05-30  Oscar Figueiredo  <Oscar.Figueiredo@di.epfl.ch>
 
        * ldap.el (ldap-ignore-attribute-codings): New variable
 1999-05-30  Oscar Figueiredo  <Oscar.Figueiredo@di.epfl.ch>
 
        * ldap.el (ldap-ignore-attribute-codings): New variable

diff --git a/lisp/ldap.el b/lisp/ldap.el
index bb31a83..4006514 100644 (file)
--- a/lisp/ldap.el
+++ b/lisp/ldap.el
@@ -5,7 +5,7 @@
 ;; Author: Oscar Figueiredo <Oscar.Figueiredo@di.epfl.ch>
 ;; Maintainer: Oscar Figueiredo <Oscar.Figueiredo@di.epfl.ch>
 ;; Created: Jan 1998
 ;; Author: Oscar Figueiredo <Oscar.Figueiredo@di.epfl.ch>
 ;; Maintainer: Oscar Figueiredo <Oscar.Figueiredo@di.epfl.ch>
 ;; Created: Jan 1998

-;; Version: $Revision: 1.7.2.5 $
+;; Version: $Revision: 1.7.2.3 $

 ;; Keywords: help comm
 
 ;; This file is part of XEmacs
 ;; Keywords: help comm
 
 ;; This file is part of XEmacs

diff --git a/lisp/lib-complete.el b/lisp/lib-complete.el
index 3713295..7ae20c3 100644 (file)
--- a/lisp/lib-complete.el
+++ b/lisp/lib-complete.el
@@ -38,7 +38,7 @@
 ;; Last Modified By: Heiko M|nkel <muenkel@tnt.uni-hannover.de>
 ;; Additional XEmacs integration By: Chuck Thompson <cthomp@cs.uiuc.edu>
 ;; Last Modified On: Thu Jul 1 14:23:00 1994
 ;; Last Modified By: Heiko M|nkel <muenkel@tnt.uni-hannover.de>
 ;; Additional XEmacs integration By: Chuck Thompson <cthomp@cs.uiuc.edu>
 ;; Last Modified On: Thu Jul 1 14:23:00 1994

-;; RCS Info        : $Revision: 1.3.2.2 $ $Locker:  $
+;; RCS Info        : $Revision: 1.3.2.1 $ $Locker:  $

 ;; ========================================================================
 ;; NOTE: XEmacs must be redumped if this file is changed.
 ;;
 ;; ========================================================================
 ;; NOTE: XEmacs must be redumped if this file is changed.
 ;;

diff --git a/lisp/subr.el b/lisp/subr.el
index 6a49cff..9adf57e 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -294,10 +294,14 @@ Otherwise treat \\ in NEWTEXT string as special:
 If PATTERN is omitted, it defaults to \"[ \\f\\t\\n\\r\\v]+\"."
   (or pattern
       (setq pattern "[ \f\t\n\r\v]+"))
 If PATTERN is omitted, it defaults to \"[ \\f\\t\\n\\r\\v]+\"."
   (or pattern
       (setq pattern "[ \f\t\n\r\v]+"))

-  ;; The FSF version of this function takes care not to cons in case
-  ;; of infloop.  Maybe we should synch?
-  (let (parts (start 0))
-    (while (string-match pattern string start)
+  (let (parts (start 0) (len (length string)))
+    (if (string-match pattern string)
+       (setq parts (cons (substring string 0 (match-beginning 0)) parts)
+             start (match-end 0)))
+    (while (and (< start len)
+               (string-match pattern string (if (> start (match-beginning 0))
+                                                start
+                                              (1+ start))))

       (setq parts (cons (substring string start (match-beginning 0)) parts)
            start (match-end 0)))
     (nreverse (cons (substring string start) parts))))
       (setq parts (cons (substring string start (match-beginning 0)) parts)
            start (match-end 0)))
     (nreverse (cons (substring string start) parts))))

diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index 2f92e38..c1d5322 100644 (file)
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,3 +1,7 @@
+1999-06-04  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+       * XEmacs 21.2.15 is released
+

 1999-05-17  Jerry James  <jerry@cs.ucsb.edu>
 
        * xlwmenu.c (make_shadow_gcs): Test bottom_shadow_pixmap before
 1999-05-17  Jerry James  <jerry@cs.ucsb.edu>
 
        * xlwmenu.c (make_shadow_gcs): Test bottom_shadow_pixmap before

diff --git a/man/ChangeLog b/man/ChangeLog
index 024bba0..59df456 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+1999-06-04  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+       * XEmacs 21.2.15 is released
+

 1999-05-30  Albert Chin-A-Young <china@thewrittenword.com>
 
        * custom.texi, external-widget.texi: Minor
 1999-05-30  Albert Chin-A-Young <china@thewrittenword.com>
 
        * custom.texi, external-widget.texi: Minor

diff --git a/man/info.texi b/man/info.texi
index 1b6c0da..d2fda6f 100644 (file)
--- a/man/info.texi
+++ b/man/info.texi
@@ -3,7 +3,7 @@
 @setfilename ../info/info.info
 @settitle Info 1.0
 @comment %**end of header 
 @setfilename ../info/info.info
 @settitle Info 1.0
 @comment %**end of header 

-@comment $Id: info.texi,v 1.4 1998/06/30 06:35:28 steve Exp $
+@comment $Id: info.texi,v 1.4 1997/07/10 21:58:11 karl Exp $

 
 @dircategory Texinfo documentation system
 @direntry
 
 @dircategory Texinfo documentation system
 @direntry

diff --git a/man/texinfo.tex b/man/texinfo.tex
index 6057ffa..3ce4715 100644 (file)
--- a/man/texinfo.tex
+++ b/man/texinfo.tex
@@ -1,5 +1,5 @@
 % texinfo.tex -- TeX macros to handle Texinfo files.
 % texinfo.tex -- TeX macros to handle Texinfo files.

-% $Id: texinfo.tex,v 1.5 1998/06/13 04:28:12 steve Exp $
+% $Id: texinfo.tex,v 2.227 1998/02/25 22:54:34 karl Exp $

 %
 % Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98
 % Free Software Foundation, Inc.
 %
 % Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98
 % Free Software Foundation, Inc.

@@ -44,7 +44,7 @@
 
 % This automatically updates the version number based on RCS.
 \def\deftexinfoversion$#1: #2 ${\def\texinfoversion{#2}}
 
 % This automatically updates the version number based on RCS.
 \def\deftexinfoversion$#1: #2 ${\def\texinfoversion{#2}}

-\deftexinfoversion$Revision: 1.5 $
+\deftexinfoversion$Revision: 2.227 $

 \message{Loading texinfo package [Version \texinfoversion]:}
 
 % If in a .fmt file, print the version number
 \message{Loading texinfo package [Version \texinfoversion]:}
 
 % If in a .fmt file, print the version number

diff --git a/man/texinfo.texi b/man/texinfo.texi
index e5cd94d..0bc09a7 100644 (file)
--- a/man/texinfo.texi
+++ b/man/texinfo.texi
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
 \input texinfo.tex    @c -*-texinfo-*-

-@c $Id: texinfo.texi,v 1.8.2.1 1999/03/04 15:48:24 steveb Exp $
+@c $Id: texinfo.txi,v 1.50 1998/02/27 21:21:34 karl Exp $

 @c %**start of header
 
 @c All text is ignored before the setfilename.
 @c %**start of header
 
 @c All text is ignored before the setfilename.

diff --git a/man/xemacs-faq.texi b/man/xemacs-faq.texi
index 666e99b..76641d8 100644 (file)
--- a/man/xemacs-faq.texi
+++ b/man/xemacs-faq.texi
@@ -7,7 +7,7 @@
 @finalout
 @titlepage
 @title XEmacs FAQ
 @finalout
 @titlepage
 @title XEmacs FAQ

-@subtitle Frequently asked questions about XEmacs @* Last Modified: $Date: 1999/05/13 12:26:40 $
+@subtitle Frequently asked questions about XEmacs @* Last Modified: $Date: 1999/03/04 15:48:25 $

 @sp 1
 @author Tony Rossini <arossini@@stat.sc.edu>
 @author Ben Wing <wing@@666.com>
 @sp 1
 @author Tony Rossini <arossini@@stat.sc.edu>
 @author Ben Wing <wing@@666.com>

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 85f7d7e..852430b 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+1999-06-04  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+       * XEmacs 21.2.15 is released
+

 1999-05-31  Andy Piper  <andy@xemacs.org>
 
        * xemacs.mak: add select & select-x targets.
 1999-05-31  Andy Piper  <andy@xemacs.org>
 
        * xemacs.mak: add select & select-x targets.

diff --git a/src/ChangeLog b/src/ChangeLog
index 34ab6df..ad0ec97 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,28 @@
+1999-06-04  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+       * XEmacs 21.2.15 is released
+
+1999-06-01  Hirokazu FUKUI  <fukui@atesoft.advantest.co.jp>
+
+       * frame.c (Fset_mouse_position):
+       (Fset_mouse_pixel_position):
+       * window.c (Fsplit_window):
+       (Fmove_to_window_line):
+       Fix crash when invoking functions with an already-deleted window
+       argument.
+
+       * indent.c (vertical_motion_1):
+       (vmotion_pixels):
+       (Fvertical_motion_pixels):
+       * window.c (Fwindow_displayed_text_pixel_height):
+       Fix error message when invoking functions with an already-deleted
+       window argument.
+
+1999-06-01  Jan Vroonhof  <vroonhof@math.ethz.ch>
+
+       * sysdep.c (request_sigio_on_device): Guard against glibc
+       2.1's stub streams implementation.
+

 1999-06-03  SL Baur  <steve@xemacs.org>
 
        * config.h.in:
 1999-06-03  SL Baur  <steve@xemacs.org>
 
        * config.h.in:

diff --git a/src/frame.c b/src/frame.c
index 2fcd539..bd85ae4 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -1838,7 +1838,7 @@ Note also: Warping the mouse is contrary to the ICCCM, so be very sure
   struct window *w;
   int pix_x, pix_y;
 
   struct window *w;
   int pix_x, pix_y;
 

-  CHECK_WINDOW (window);
+  CHECK_LIVE_WINDOW (window);

   CHECK_INT (x);
   CHECK_INT (y);
 
   CHECK_INT (x);
   CHECK_INT (y);
 

@@ -1862,7 +1862,7 @@ before calling this function on it, like this.
 {
   struct window *w;
 
 {
   struct window *w;
 

-  CHECK_WINDOW (window);
+  CHECK_LIVE_WINDOW (window);

   CHECK_INT (x);
   CHECK_INT (y);
 
   CHECK_INT (x);
   CHECK_INT (y);
 

diff --git a/src/indent.c b/src/indent.c
index 9194ef8..5d97e4d 100644 (file)
--- a/src/indent.c
+++ b/src/indent.c
@@ -665,7 +665,7 @@ Lisp_Object vertical_motion_1 (Lisp_Object lines, Lisp_Object window,
   if (NILP (window))
     window = Fselected_window (Qnil);
 
   if (NILP (window))
     window = Fselected_window (Qnil);
 

-  CHECK_WINDOW (window);
+  CHECK_LIVE_WINDOW (window);

   CHECK_INT (lines);
 
   selected = (EQ (window, Fselected_window (Qnil)));
   CHECK_INT (lines);
 
   selected = (EQ (window, Fselected_window (Qnil)));

@@ -739,7 +739,7 @@ vmotion_pixels (Lisp_Object window, Bufpos start, int pixels, int how,
   if (NILP (window))
     window = Fselected_window (Qnil);
 
   if (NILP (window))
     window = Fselected_window (Qnil);
 

-  CHECK_WINDOW (window);
+  CHECK_LIVE_WINDOW (window);

   w = XWINDOW (window);
 
   eobuf = BUF_ZV (XBUFFER (w->buffer));
   w = XWINDOW (window);
 
   eobuf = BUF_ZV (XBUFFER (w->buffer));

@@ -842,7 +842,7 @@ that the motion should be as close as possible to PIXELS.
   if (NILP (window))
     window = Fselected_window (Qnil);
 
   if (NILP (window))
     window = Fselected_window (Qnil);
 

-  CHECK_WINDOW (window);
+  CHECK_LIVE_WINDOW (window);

   CHECK_INT (pixels);
 
   selected = (EQ (window, Fselected_window (Qnil)));
   CHECK_INT (pixels);
 
   selected = (EQ (window, Fselected_window (Qnil)));

diff --git a/src/sysdep.c b/src/sysdep.c
index 7024e35..0dc66fa 100644 (file)
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -1019,7 +1019,7 @@ request_sigio_on_device (struct device *d)
 {
   int filedesc = DEVICE_INFD (d);
 
 {
   int filedesc = DEVICE_INFD (d);
 

-#if defined (I_SETSIG) && !defined(HPUX10)
+#if defined (I_SETSIG) && !defined(HPUX10) && !defined(LINUX)

   {
     int events=0;
     ioctl (filedesc, I_GETSIG, &events);
   {
     int events=0;
     ioctl (filedesc, I_GETSIG, &events);

diff --git a/src/unexsol2.c b/src/unexsol2.c
index 06e71e7..d9de182 100644 (file)
--- a/src/unexsol2.c
+++ b/src/unexsol2.c
@@ -20,7 +20,7 @@ Boston, MA 02111-1307, USA.  */
 
 /* Synched up with: Not in FSF. */
 
 
 /* Synched up with: Not in FSF. */
 

-/* #pragma ident "@(#) $Id: unexsol2.c,v 1.3 1997/10/13 03:35:33 steve Exp $" */
+/* #pragma ident "@(#) $Id: unexsol2.c,v 1.2 1995/01/25 20:39:16 georgn Exp $" */

 
 #include <stdlib.h>
 #include <stdio.h>
 
 #include <stdlib.h>
 #include <stdio.h>

diff --git a/src/window.c b/src/window.c
index 868156c..53de996 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -1345,7 +1345,7 @@ is non-nil, do not include space occupied by clipped lines.
   if (NILP (window))
     window = Fselected_window (Qnil);
 
   if (NILP (window))
     window = Fselected_window (Qnil);
 

-  CHECK_WINDOW (window);
+  CHECK_LIVE_WINDOW (window);

   w = XWINDOW (window);
 
   start  = marker_position (w->start[CURRENT_DISP]);
   w = XWINDOW (window);
 
   start  = marker_position (w->start[CURRENT_DISP]);

@@ -3366,7 +3366,7 @@ and put SIZE columns in the first of the pair.
   if (NILP (window))
     window = Fselected_window (Qnil);
   else
   if (NILP (window))
     window = Fselected_window (Qnil);
   else

-    CHECK_WINDOW (window);
+    CHECK_LIVE_WINDOW (window);

 
   o = XWINDOW (window);
   f = XFRAME (WINDOW_FRAME (o));
 
   o = XWINDOW (window);
   f = XFRAME (WINDOW_FRAME (o));

@@ -4304,7 +4304,7 @@ If WINDOW is nil, the selected window is used.
   if (NILP (window))
     window = Fselected_window (Qnil);
   else
   if (NILP (window))
     window = Fselected_window (Qnil);
   else

-    CHECK_WINDOW (window);
+    CHECK_LIVE_WINDOW (window);

   w = XWINDOW (window);
   b = XBUFFER (w->buffer);
 
   w = XWINDOW (window);
   b = XBUFFER (w->buffer);
 

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 17c3971..a904470 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,11 @@
+1999-06-04  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+       * XEmacs 21.2.15 is released
+
+1999-06-02  Oscar Figueiredo  <oscar@xemacs.org>
+
+       * automated/lisp-tests.el: Test `split-string'
+

 1999-05-27  Hrvoje Niksic  <hniksic@srce.hr>
 
        * automated/base64-tests.el: New file.
 1999-05-27  Hrvoje Niksic  <hniksic@srce.hr>
 
        * automated/base64-tests.el: New file.

diff --git a/tests/automated/lisp-tests.el b/tests/automated/lisp-tests.el
index 1349070..3ee719b 100644 (file)
--- a/tests/automated/lisp-tests.el
+++ b/tests/automated/lisp-tests.el
@@ -785,3 +785,20 @@
  (defun test-emacs-buffer-local-parameter (test-emacs-buffer-local-variable)
    (setq test-emacs-buffer-local-variable nil)))
 (test-emacs-buffer-local-parameter nil)
  (defun test-emacs-buffer-local-parameter (test-emacs-buffer-local-variable)
    (setq test-emacs-buffer-local-variable nil)))
 (test-emacs-buffer-local-parameter nil)

+
+;;-----------------------------------------------------
+;; Test split-string
+;;-----------------------------------------------------
+;; Hrvoje didn't like these tests so I'm disabling them for now. -sb
+;(Assert (equal (split-string "foo" "") '("" "f" "o" "o" "")))
+;(Assert (equal (split-string "foo" "^") '("" "foo")))
+;(Assert (equal (split-string "foo" "$") '("foo" "")))
+(Assert (equal (split-string "foo,bar" ",") '("foo" "bar")))
+(Assert (equal (split-string ",foo,bar," ",") '("" "foo" "bar" "")))
+(Assert (equal (split-string ",foo,bar," "^,") '("" "foo,bar,")))
+(Assert (equal (split-string ",foo,bar," ",$") '(",foo,bar" "")))
+(Assert (equal (split-string ",foo,,bar," ",") '("" "foo" "" "bar" "")))
+(Assert (equal (split-string "foo,,,bar" ",") '("foo" "" "" "bar")))
+(Assert (equal (split-string "foo,,bar,," ",") '("foo" "" "bar" "" "")))
+(Assert (equal (split-string "foo,,bar" ",+") '("foo" "bar")))
+(Assert (equal (split-string ",foo,,bar," ",+") '("" "foo" "bar" "")))

diff --git a/version.sh b/version.sh
index 1d410f8..bd96260 100644 (file)
--- a/version.sh
+++ b/version.sh
@@ -2,8 +2,8 @@
 emacs_is_beta=t
 emacs_major_version=21
 emacs_minor_version=2
 emacs_is_beta=t
 emacs_major_version=21
 emacs_minor_version=2

-emacs_beta_version=14
-xemacs_codename="Dionysos"
+emacs_beta_version=15
+xemacs_codename="Sakuragawa"

 infodock_major_version=4
 infodock_minor_version=0
 infodock_build_version=7
 infodock_major_version=4
 infodock_minor_version=0
 infodock_build_version=7