User: vins Date: 05/01/29 02:33:19 Modified: xemacs/src Tag: release-21-4 ChangeLog regex.c sheap.c Log: Fix gnus regexp infloop. Make sheap.c compile under gcc-3.3.3 on cygwin (Ben's version). Update directory locations in nt/config.inc.samp to correspond to current optional-libs.exe and Cygwin makeinfo. Revision Changes Path No revision No revision 1.89.2.33 +8 -0 XEmacs/xemacs/nt/ChangeLog (In the diff below, changes in quantity of whitespace are not shown.) Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/ChangeLog,v retrieving revision 1.89.2.32 retrieving revision 1.89.2.33 diff -u -b -r1.89.2.32 -r1.89.2.33 --- ChangeLog 2004/12/06 01:08:27 1.89.2.32 +++ ChangeLog 2005/01/29 01:33:05 1.89.2.33 ＠＠ -1,3 +1,11 ＠＠ +2005-01-28 Ben Wing <ben(a)xemacs.org&gt; + + * config.inc.samp: + * config.inc.samp (PNG_DIR): + * config.inc.samp (MAKEINFO): + Update directory locations to correspond to current optional-libs.exe + and Cygwin makeinfo. + 2004-12-05 Vin Shelton <acs(a)xemacs.org&gt; * XEmacs 21.4.16 is released 1.2.2.3 +35 -16 XEmacs/xemacs/nt/config.inc.samp (In the diff below, changes in quantity of whitespace are not shown.) Index: config.inc.samp =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/config.inc.samp,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -u -b -r1.2.2.2 -r1.2.2.3 --- config.inc.samp 2002/08/20 11:36:14 1.2.2.2 +++ config.inc.samp 2005/01/29 01:33:05 1.2.2.3 ＠＠ -26,39 +26,58 ＠＠ GTK_DIR= ############################################################################ +# Compiled-in features: graphics formats # +############################################################################ + +# Directory under which the optional libraries are placed. To make your +# life easy, just grab http://ftp.xemacs.org/aux/optional-libs.exe +# (a self-installing .ZIP) and unzip them into an appropriate directory +# (by default, c:\src). This gets you precompiled versions of all of +# the libraries below. +OPTIONAL_LIBRARY_DIR=c:\src # Set this to enable XPM support (virtually mandatory), and specify -# the directory containing xpm. +# the directory containing xpm. Get the library from +# http://ftp.xemacs.org/aux/xpm-3.4k.tar.gz. HAVE_XPM=1 -XPM_DIR=c:\src\xpm-3.4k +XPM_DIR=$(OPTIONAL_LIBRARY_DIR)\xpm-3.4k -# Set this to enable GIF support. +# Set this to enable GIF support (built-in). HAVE_GIF=1 # Set this to enable PNG support (virtually mandatory), and specify -# the directories containing png and zlib. +# the directories containing png and zlib. Get the latest version from +# ftp://ftp.uu.net/graphics/png/. NOTE: In order to compile libpng, +# you will have to rename the zlib directory to just `zlib'. We don't +# do that here so we can preserve the version number, like for the other +# libraries. HAVE_PNG=1 -PNG_DIR=c:\src\libpng-1.0.9 -ZLIB_DIR=c:\src\zlib - -# Set this to enable TIFF support, and specify the directory containing tiff. -HAVE_TIFF=0 -TIFF_DIR= +PNG_DIR=$(OPTIONAL_LIBRARY_DIR)\libpng-1.2.8 +ZLIB_DIR=$(OPTIONAL_LIBRARY_DIR)\zlib-1.2.1 -# Set this to enable JPEG support, and specify the directory containing jpeg. +# Set this to enable JPEG support (useful, but not necessary), and specify +# the directory containing jpeg. Get the latest version from +# ftp://ftp.uu.net/graphics/jpeg/. HAVE_JPEG=1 -JPEG_DIR=c:\src\jpeg-6b +JPEG_DIR=$(OPTIONAL_LIBRARY_DIR)\jpeg-6b + +# Set this to enable TIFF support (not very important), and specify the +# directory containing tiff. Get the latest version from +# ftp://ftp.uu.net/graphics/tiff/. +HAVE_TIFF=0 +TIFF_DIR=$(OPTIONAL_LIBRARY_DIR)\tiff-v3.5.7 -# Set this to enable XFace support, and specify the directory containing -# compface. +# Set this to enable XFace support (not very important), and specify the +# directory containing compface. Get the library from +# http://ftp.xemacs.org/aux/compface-1.5.tar.gz. HAVE_XFACE=0 -COMPFACE_DIR= +COMPFACE_DIR=$(OPTIONAL_LIBRARY_DIR)\compface-1.5.1 ############################################################################ # Set this to specify the location of makeinfo. (If not set, XEmacs will # attempt to use its built-in texinfo support when building info files.) -MAKEINFO=c:\src\texinfo-4.0\makeinfo\makeinfo.exe +MAKEINFO=c:\cygwin\bin\makeinfo.exe ############################################################################ No revision No revision 1.290.2.90 +10 -0 XEmacs/xemacs/src/ChangeLog (In the diff below, changes in quantity of whitespace are not shown.) Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.290.2.89 retrieving revision 1.290.2.90 diff -u -b -r1.290.2.89 -r1.290.2.90 --- ChangeLog 2005/01/25 01:15:27 1.290.2.89 +++ ChangeLog 2005/01/29 01:33:07 1.290.2.90 ＠＠ -1,3 +1,13 ＠＠ +2005-01-26 Arnaud Giersch <arnaud.giersch(a)free.fr&gt; + + * regex.c (re_match_2_internal): + Correctly initialize loop which clears uninitialized registers. + +2005-01-28 Vin Shelton <acs(a)xemacs.org&gt; + + * sheap.c (more_static_core): Applied Ben's version of the long + string patch. + 2005-01-24 Vin Shelton <acs(a)xemacs.org&gt; * sheap.c (more_static_core): Reformatted printf string so 1.25.2.12 +69 -67 XEmacs/xemacs/src/regex.c (In the diff below, changes in quantity of whitespace are not shown.) Index: regex.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/regex.c,v retrieving revision 1.25.2.11 retrieving revision 1.25.2.12 diff -u -b -r1.25.2.11 -r1.25.2.12 --- regex.c 2005/01/16 02:38:58 1.25.2.11 +++ regex.c 2005/01/29 01:33:11 1.25.2.12 ＠＠ -4714,10 +4714,11 ＠＠ succeed_label: DEBUG_PRINT1 ("Accepting match.\n"); + { /* If caller wants register contents data back, fill REGS. */ + int num_nonshy_regs = bufp->re_nsub + 1; if (regs && !bufp->no_sub) { - int num_nonshy_regs = bufp->re_nsub + 1; /* Have the register data arrays been allocated? */ if (bufp->regs_allocated == REGS_UNALLOCATED) { /* No. So allocate them with malloc. We need one ＠＠ -4801,8 +4802,9 ＠＠ have to change the API for this function to reflect that, and audit all callers. */ if (regs && regs->num_regs > 0) - for (mcnt = num_regs; mcnt < regs->num_regs; mcnt++) + for (mcnt = num_nonshy_regs; mcnt < regs->num_regs; mcnt++) regs->start[mcnt] = regs->end[mcnt] = -1; + } DEBUG_PRINT4 ("%u failure points pushed, %u popped (%u remain).\n", nfailure_points_pushed, nfailure_points_popped, 1.12.2.2 +10 -10 XEmacs/xemacs/src/sheap.c (In the diff below, changes in quantity of whitespace are not shown.) Index: sheap.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/sheap.c,v retrieving revision 1.12.2.1 retrieving revision 1.12.2.2 diff -u -b -r1.12.2.1 -r1.12.2.2 --- sheap.c 2005/01/25 01:15:30 1.12.2.1 +++ sheap.c 2005/01/29 01:33:12 1.12.2.2 ＠＠ -81,16 +81,16 ＠＠ if (static_heap_ptr + size >= static_heap_base + static_heap_size) { printf( -"\nRequested %d bytes, static heap exhausted! base is %p, current ptr\n\ -is %p. You have exhausted the static heap.\n\ -\n\ -If you are simply trying to compile, remove sheap-adjust.h\n\ -and recompile from the top level. If this doesn't\n\ -work then STATIC_HEAP_SLOP (defined in this file) is too small.\n\ -\n\ -If you want to run temacs, change SHEAP_ADJUSTMENT in sheap-adjust.h\n\ -to 0 or a +ve number. Generally you should *not* try to run temacs\n\ -with a static heap, you should dump first.\n", size, +"\nRequested %d bytes, static heap exhausted! base is %p, current ptr\n" +"is %p. You have exhausted the static heap. \n" +"\n" +"If you are simply trying to compile, remove sheap-adjust.h\n" +"and recompile from the top level. If this doesn't\n" +"work then STATIC_HEAP_SLOP (defined in this file) is too small.\n" +"\n" +"If you want to run temacs, change SHEAP_ADJUSTMENT in sheap-adjust.h\n" +"to 0 or a +ve number. Generally you should *not* try to run temacs\n" +"with a static heap, you should dump first.\n", size, static_heap_base, static_heap_ptr); exit(-1);