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

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

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 4fd173f..968f40e 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2000-02-23  Martin Buchholz <martin@xemacs.org>
+
+       * XEmacs 21.2.31 is released.
+
 2000-02-21  Martin Buchholz <martin@xemacs.org>
 
        * XEmacs 21.2.30 is released.

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 6190d5e..964cd54 100644 (file)
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -65,8 +65,9 @@
                (prog1 (buffer-substring)
                  (kill-buffer (current-buffer)))))
 
-       (setq load-path (split-path (getenv "EMACSBOOTSTRAPLOADPATH")))
-       (setq module-load-path (split-path (getenv "EMACSBOOTSTRAPMODULEPATH")))
+       (let ((build-root (expand-file-name ".." invocation-directory)))
+         (setq load-path (list (expand-file-name "lisp" build-root)))
+         (setq module-load-path (list (expand-file-name "modules" build-root))))
 
        ;; message not defined yet ...
        (external-debugging-output (format "\nUsing load-path %s" load-path))

diff --git a/lisp/make-docfile.el b/lisp/make-docfile.el
index 3b77495..7a9365c 100644 (file)
--- a/lisp/make-docfile.el
+++ b/lisp/make-docfile.el
@@ -75,7 +75,8 @@
   (setq command-line-args (cdr command-line-args)))
 
 ;; Then process the list of Lisp files.
-(setq load-path (split-path (getenv "EMACSBOOTSTRAPLOADPATH")))
+(let ((build-root (expand-file-name ".." invocation-directory)))
+  (setq load-path (list (expand-file-name "lisp" build-root))))
 
 (load "very-early-lisp" nil t)
 
@@ -86,10 +87,6 @@
 (load "setup-paths.el")
 (load "dump-paths.el")
 
-(setq
- load-path
- (nconc load-path (split-path (getenv "EMACSBOOTSTRAPLOADPATH"))))
-
 (let (preloaded-file-list)
   (load (expand-file-name "../lisp/dumped-lisp.el"))
 

diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index bf5ee4b..1d3eb2c 100644 (file)
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,3 +1,14 @@
+2000-02-23  Martin Buchholz <martin@xemacs.org>
+
+       * XEmacs 21.2.31 is released.
+
+2000-02-22  Andy Piper  <andy@xemacs.org>
+
+       * lwlib-Xm.c (xm_update_one_widget): set widget args last in case
+       anything messes with them in the meantime.
+       * lwlib-Xlw.c (xlw_update_one_widget): ditto.
+       * lwlib-Xaw.c (xaw_update_one_widget): ditto.
+
 2000-02-21  Martin Buchholz <martin@xemacs.org>
 
        * XEmacs 21.2.30 is released.

diff --git a/lwlib/lwlib-Xaw.c b/lwlib/lwlib-Xaw.c
index dd766dc..c51522c 100644 (file)
--- a/lwlib/lwlib-Xaw.c
+++ b/lwlib/lwlib-Xaw.c
@@ -126,9 +126,6 @@ void
 xaw_update_one_widget (widget_instance *instance, Widget widget,
                       widget_value *val, Boolean deep_p)
 {
-  if (val->args && val->args->nargs)
-    XtSetValues (widget, val->args->args, val->args->nargs);
-
   if (0)
     ;
 #ifdef LWLIB_SCROLLBARS_ATHENA
@@ -193,6 +190,9 @@ xaw_update_one_widget (widget_instance *instance, Widget widget,
 #endif /* LWLIB_WIDGETS_ATHENA */
     }
 #endif /* LWLIB_DIALOGS_ATHENA */
+  /* Lastly update our global arg values. */
+  if (val->args && val->args->nargs)
+    XtSetValues (widget, val->args->args, val->args->nargs);
 }
 
 void

diff --git a/lwlib/lwlib-Xlw.c b/lwlib/lwlib-Xlw.c
index e4e91d6..71b4959 100644 (file)
--- a/lwlib/lwlib-Xlw.c
+++ b/lwlib/lwlib-Xlw.c
@@ -536,9 +536,6 @@ xlw_update_one_widget (widget_instance* instance, Widget widget,
                       widget_value* val, Boolean deep_p)
 {
   WidgetClass class = XtClass (widget);
-  /* Update up global arg values. */
-  if (val->args && val->args->nargs)
-    XtSetValues (widget, val->args->args, val->args->nargs);
 
   if (0)
     ;
@@ -567,6 +564,9 @@ xlw_update_one_widget (widget_instance* instance, Widget widget,
       xlw_update_tab_control (instance, widget, val);
     }
 #endif
+  /* Lastly update our global arg values. */
+  if (val->args && val->args->nargs)
+    XtSetValues (widget, val->args->args, val->args->nargs);
 }
 
 void

diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c
index ff1b8ff..76d893d 100644 (file)
--- a/lwlib/lwlib-Xm.c
+++ b/lwlib/lwlib-Xm.c
@@ -791,8 +791,6 @@ xm_update_one_widget (widget_instance* instance, Widget widget,
   /* Common to all widget types */
   XtSetArg (al [ac], XmNsensitive, val->enabled);              ac++;
   XtSetArg (al [ac], XmNuserData,  val->call_data);    ac++;
-  lw_add_value_args_to_args (val, al, &ac);
-
   XtSetValues (widget, al, ac);
 
 #if defined (LWLIB_DIALOGS_MOTIF) || defined (LWLIB_MENUBARS_MOTIF) || defined (LWLIB_WIDGETS_MOTIF)
@@ -856,6 +854,9 @@ xm_update_one_widget (widget_instance* instance, Widget widget,
       xm_update_scrollbar (instance, widget, val);
     }
 #endif
+  /* Lastly update our global arg values. */
+  if (val->args && val->args->nargs)
+    XtSetValues (widget, val->args->args, val->args->nargs);
 }
 
 \f/* getting the value back */

diff --git a/man/ChangeLog b/man/ChangeLog
index 142c7d2..76ba93a 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2000-02-23  Martin Buchholz <martin@xemacs.org>
+
+       * XEmacs 21.2.31 is released.
+
 2000-02-21  Martin Buchholz <martin@xemacs.org>
 
        * XEmacs 21.2.30 is released.

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 0ec6b19..fffa7b9 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,11 @@
+2000-02-23  Martin Buchholz <martin@xemacs.org>
+
+       * XEmacs 21.2.31 is released.
+
+2000-02-22  Martin Buchholz  <martin@xemacs.org>
+
+       * config.h (gc_checking_assert): New.
+
 2000-02-21  Martin Buchholz <martin@xemacs.org>
 
        * XEmacs 21.2.30 is released.

diff --git a/nt/config.h b/nt/config.h
index f751412..23974d1 100644 (file)
--- a/nt/config.h
+++ b/nt/config.h
@@ -342,6 +342,11 @@ Boston, MA 02111-1307, USA.  */
 #define bufpos_checking_assert(assertion)
 #endif
 
+#ifdef ERROR_CHECK_GC
+#define gc_checking_assert(assertion) assert (assertion)
+#else
+#define gc_checking_assert(assertion)
+#endif
 
 /* Define MEMORY_USAGE_STATS if you want extra code compiled in to
    determine where XEmacs's memory is going. */

diff --git a/src/Makefile.in.in b/src/Makefile.in.in
index bcc0103..0934deb 100644 (file)
--- a/src/Makefile.in.in
+++ b/src/Makefile.in.in
@@ -309,18 +309,10 @@ mo_dir = ${etcdir}
 mo_file = ${mo_dir}emacs.mo
 #endif
 
-#ifdef WINDOWSNT
-LOADPATH   =  EMACSBOOTSTRAPLOADPATH="${lispdir};${blddir}"
-MODULEPATH =  EMACSBOOTSTRAPMODULEPATH="${moduledir};${blddir}"
-#else
-LOADPATH   =  EMACSBOOTSTRAPLOADPATH="${lispdir}:${blddir}"
-MODULEPATH =  EMACSBOOTSTRAPMODULEPATH="${moduledir}:${blddir}"
-#endif
-DUMPENV = $(LOADPATH) $(MODULEPATH)
-temacs_loadup = $(DUMPENV) ./temacs -batch -l ${srcdir}/../lisp/loadup.el
+temacs_loadup = ./temacs -batch -l ${srcdir}/../lisp/loadup.el
 dump_temacs   = ${temacs_loadup} dump
 run_temacs    = ${temacs_loadup} run-temacs
-debug_temacs = $(DUMPENV) gdb temacs
+debug_temacs = gdb temacs
 
 release: temacs ${libsrc}DOC $(mo_file) ${other_files}
 #ifdef CANNOT_DUMP
@@ -329,7 +321,7 @@ release: temacs ${libsrc}DOC $(mo_file) ${other_files}
        -if [ -w ${srcdir}/../lisp ]; then \
          w=`pwd`; cd ${srcdir} && $${w}/temacs -batch -l ${srcdir}/../lisp/inc-vers; \
        else true; fi
-       -$(DUMPENV) ./temacs -batch -l ${srcdir}/../lisp/loadup.el dump
+       -./temacs -batch -l ${srcdir}/../lisp/loadup.el dump
        touch release
 #endif /* ! defined (CANNOT_DUMP) */
 
@@ -362,7 +354,7 @@ FRC.update-elc.stamp :
 
 update-elc.stamp : temacs FRC.update-elc.stamp
        @touch NOBYTECOMPILE
-       ${DUMPENV} ./temacs -batch -l ${srcdir}/../lisp/update-elc.el
+       ./temacs -batch -l ${srcdir}/../lisp/update-elc.el
        @if test ! -f $@ -o -f NOBYTECOMPILE; then touch $@; fi; \
         $(RM) NOBYTECOMPILE
 

diff --git a/src/glyphs-x.c b/src/glyphs-x.c
index e56a5c4..6124be4 100644 (file)
--- a/src/glyphs-x.c
+++ b/src/glyphs-x.c
@@ -2494,7 +2494,7 @@ x_widget_instantiate (Lisp_Object image_instance, Lisp_Object instantiator,
 
   IMAGE_INSTANCE_SUBWINDOW_ID (ii) = (void*)wid;
   IMAGE_INSTANCE_X_WIDGET_LWID (ii) = id;
-
+#if 0
   /* Resize the widget here so that the values do not get copied by
      lwlib. */
   ac = 0;
@@ -2503,6 +2503,7 @@ x_widget_instantiate (Lisp_Object image_instance, Lisp_Object instantiator,
   XtSetArg (al [ac], XtNheight,
            (Dimension)IMAGE_INSTANCE_SUBWINDOW_HEIGHT (ii)); ac++;
   XtSetValues (IMAGE_INSTANCE_X_WIDGET_ID (ii), al, ac);
+#endif
   /* because the EmacsManager is the widgets parent we have to
      offset the redisplay of the widget by the amount the text
      widget is inside the manager. */

diff --git a/src/ntheap.c b/src/ntheap.c
index 704bd32..9372dd1 100644 (file)
--- a/src/ntheap.c
+++ b/src/ntheap.c
@@ -122,7 +122,7 @@ allocate_heap (void)
   unsigned long base = 0x01B00000;   /*  27MB */
   /* Temporary hack for the non-starting problem - use 28 (256Mb) rather than VALBITS (1Gb) */
   unsigned long end  = 1 << 28;      /* 256MB */
-  void *ptr;
+  void *ptr = NULL;
 
 #define NTHEAP_PROBE_BASE 1
 #if NTHEAP_PROBE_BASE /* This is never normally defined */

diff --git a/src/s/aix4.h b/src/s/aix4.h
index 5836bd5..bb3a15d 100644 (file)
--- a/src/s/aix4.h
+++ b/src/s/aix4.h
@@ -24,3 +24,9 @@
 struct ether_addr;
 struct sockaddr_dl;
 #endif /* C code */
+
+/* getaddrinfo is broken in AIX 4.3 as per IY04165.
+   At this time (2/21/2000), there's no PTF available.
+   -- Mike Sperber <mike@xemacs.org> */
+
+#undef HAVE_GETADDRINFO

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 9344725..5921166 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+2000-02-23  Martin Buchholz <martin@xemacs.org>
+
+       * XEmacs 21.2.31 is released.
+
 2000-02-21  Martin Buchholz <martin@xemacs.org>
 
        * XEmacs 21.2.30 is released.

diff --git a/version.sh b/version.sh
index e3759ea..faa7b82 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_beta_version=30
-xemacs_codename="Hygeia"
+emacs_beta_version=31
+xemacs_codename="Iris"
 infodock_major_version=4
 infodock_minor_version=0
 infodock_build_version=8