User: stephent Date: 05/09/23 20:20:46 Branch: xemacs sjt-xft xemacs/etc sjt-xft sjt-xft sjt-xft xemacs/lib-src sjt-xft xemacs/src sjt-xft Modified: xemacs/src ChangeLog intl-win32.c mc-alloc.c Added: xemacs/etc ChangeLog.Xft Removed: xemacs/etc configure-2.13 Log: Synch to mainline. Revision Changes Path 1.418.2.16 +8 -2 XEmacs/xemacs/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v retrieving revision 1.418.2.15 retrieving revision 1.418.2.16 diff -u -p -r1.418.2.15 -r1.418.2.16 --- ChangeLog 2005/09/23 17:04:16 1.418.2.15 +++ ChangeLog 2005/09/23 18:20:27 1.418.2.16 ＠＠ -1,6 +1,12 ＠＠ -2005-09-24 Stephen J. Turnbull <stephen(a)xemacs.org&gt; +2005-09-18 Mike Alexander <mta(a)arbortext.com&gt; - * .cvsignore: Add _darcs for Darcs users. + * configure.ac: Fix the cygwin, non-X build by adding XPM header + and library files to XE_CFLAGS. Patch from Rick Rankin. + +2005-09-17 Malcolm Purvis <malcolmp(a)xemacs.org&gt; + + * configure.in: Replace with warning to use autoconf 2.59. + * configure.ac: Removed warning about the use of autoconf 2.59. 2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org&gt; 1.1.2.3 +4 -0 XEmacs/xemacs/Attic/ChangeLog.Xft Index: ChangeLog.Xft =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/Attic/ChangeLog.Xft,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -p -r1.1.2.2 -r1.1.2.3 --- ChangeLog.Xft 2005/09/20 16:04:32 1.1.2.2 +++ ChangeLog.Xft 2005/09/23 18:20:28 1.1.2.3 ＠＠ -1,3 +1,7 ＠＠ +2005-09-24 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + + * .cvsignore: Add _darcs for Darcs users. + 2005-03-05 Malcolm Purvis <malcolmp(a)xemacs.org&gt; * configure.ac: Correct the filename of the old copy of configure. 1.1.14.12 +3 -7 XEmacs/xemacs/configure.ac Index: configure.ac =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v retrieving revision 1.1.14.11 retrieving revision 1.1.14.12 diff -u -p -r1.1.14.11 -r1.1.14.12 --- configure.ac 2005/07/13 04:43:36 1.1.14.11 +++ configure.ac 2005/09/23 18:20:28 1.1.14.12 ＠＠ -3827,6 +3827,7 ＠＠ if test "$window_system" != "none"; then xpm_problem="" if test -z "$with_xpm"; then XE_PREPEND("$incpath_xpm", CFLAGS) + XE_PREPEND("$incpath_xpm", XE_CFLAGS) XE_PREPEND("$libpath_xpm", LDFLAGS) AC_MSG_CHECKING(for Xpm - no older than 3.4f) xe_check_libs=-lXpm ＠＠ -3866,6 +3867,7 ＠＠ if test "$window_system" != "none"; then XE_PREPEND("$libpath_xpm", LDFLAGS) XE_PREPEND(-lXpm, libs_x) XE_PREPEND("$incpath_xpm", CFLAGS) + XE_PREPEND("$incpath_xpm", XE_CFLAGS) AC_MSG_CHECKING(for \"FOR_MSW\" xpm) xe_check_libs=-lXpm AC_TRY_LINK(, [XpmCreatePixmapFromData()], ＠＠ -5633,13 +5635,7 ＠＠ dnl Start stdout redirection to '| tee - ( echo " -XEmacs ${emacs_major_version}.${emacs_minor_version}${xemacs_betaname} \"$xemacs_codename\" $xemacs_extra_name configured for \`$ac_cv_build'. -" -echo " WARNING: --------------------------------------------------------------" -echo " WARNING: This was produced from a new autoconf-2.5 based configuration." -echo " WARNING: If this configuration seems buggy then copy etc/configure-2.13" -echo " WARNING: to configure and try again. Also please report the bug." -echo " WARNING: --------------------------------------------------------------" +XEmacs ${emacs_major_version}.${emacs_minor_version}${xemacs_betaname} \"$xemacs_codename\" $xemacs_extra_name configured for \`$ac_cv_build'." echo " Compilation Environment and Installation Defaults:" 1.984.2.7 +1 -1 XEmacs/xemacs/version.sh Index: version.sh =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v retrieving revision 1.984.2.6 retrieving revision 1.984.2.7 diff -u -p -r1.984.2.6 -r1.984.2.7 --- version.sh 2005/09/20 16:04:53 1.984.2.6 +++ version.sh 2005/09/23 18:20:28 1.984.2.7 ＠＠ -8,5 +8,5 ＠＠ emacs_kit_version= infodock_major_version=4 infodock_minor_version=0 infodock_build_version=8 -xemacs_extra_name="(+Xft)" +xemacs_extra_name="(+Xft+CVS-20050922)" xemacs_release_date="2005-09-14" 1.48.2.5 +2 -2 XEmacs/xemacs/etc/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/ChangeLog,v retrieving revision 1.48.2.4 retrieving revision 1.48.2.5 diff -u -p -r1.48.2.4 -r1.48.2.5 --- ChangeLog 2005/09/23 17:04:21 1.48.2.4 +++ ChangeLog 2005/09/23 18:20:33 1.48.2.5 ＠＠ -1,6 +1,6 ＠＠ -2005-09-24 Stephen J. Turnbull <stephen(a)xemacs.org&gt; +2005-09-17 Malcolm Purvis <malcolmp(a)xemacs.org&gt; - * .cvsignore: Create. Add Darcs.boring for Darcs users. + * configure-2.13: Remove. autoconf 2.59 support is stable. 2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org&gt; 1.1.2.1 +4 -0 XEmacs/xemacs/etc/Attic/ChangeLog.Xft Index: ChangeLog.Xft =================================================================== RCS file: ChangeLog.Xft diff -N ChangeLog.Xft --- /dev/null Fri Sep 23 20:20:31 2005 +++ /tmp/cvsAAAUGaGnj Fri Sep 23 20:20:34 2005 ＠＠ -0,0 +1,4 ＠＠ +2005-09-24 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + + * .cvsignore: Create. Add Darcs.boring for Darcs users. + 1.178.2.6 +5 -0 XEmacs/xemacs/lib-src/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/ChangeLog,v retrieving revision 1.178.2.5 retrieving revision 1.178.2.6 diff -u -p -r1.178.2.5 -r1.178.2.6 --- ChangeLog 2005/09/20 16:05:20 1.178.2.5 +++ ChangeLog 2005/09/23 18:20:35 1.178.2.6 ＠＠ -1,3 +1,8 ＠＠ +2005-09-18 Mike Alexander <mta(a)arbortext.com&gt; + + * installexe.sh: Don't add an exe extention to a file that already + has one. Patch from Rick Rankin. + 2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org&gt; * XEmacs 21.5.22 "cucumber" is released. 1.4.20.1 +8 -3 XEmacs/xemacs/lib-src/installexe.sh Index: installexe.sh =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/installexe.sh,v retrieving revision 1.4 retrieving revision 1.4.20.1 diff -u -p -r1.4 -r1.4.20.1 --- installexe.sh 2001/04/12 18:21:02 1.4 +++ installexe.sh 2005/09/23 18:20:36 1.4.20.1 ＠＠ -5,11 +5,16 ＠＠ shift tstr="" -while [ $# -gt 0 ] +while [[ $# -gt 0 ]] do - if [ -f $1.exe ] + if [[ -f $1.exe ]] then - tstr="$tstr$1.exe $2.exe" + if [[ "$2" == *.exe ]] + then + tstr="$tstr$1 $2" + else + tstr="$tstr$1.exe $2.exe" + fi shift 2 else tstr="$tstr$1 " 1.758.2.28 +11 -0 XEmacs/xemacs/src/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.758.2.27 retrieving revision 1.758.2.28 diff -u -p -r1.758.2.27 -r1.758.2.28 --- ChangeLog 2005/09/20 16:05:56 1.758.2.27 +++ ChangeLog 2005/09/23 18:20:37 1.758.2.28 ＠＠ -1,3 +1,14 ＠＠ +2005-09-12 Mike Alexander <mta(a)arbortext.com&gt; + + * intl-win32.c (mswindows_current_locale): Define in non-MULE + build. + +2005-09-14 Marcus Crestani <crestani(a)xemacs.org&gt; + + * mc-alloc.c (set_lookup_table): Adjust parameter to other memset + calls. + * mc-alloc.c (init_mc_allocator): Zero global allocator structure. + 2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org&gt; * XEmacs 21.5.22 "cucumber" is released. 1.13.2.3 +7 -0 XEmacs/xemacs/src/intl-win32.c Index: intl-win32.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/intl-win32.c,v retrieving revision 1.13.2.2 retrieving revision 1.13.2.3 diff -u -p -r1.13.2.2 -r1.13.2.3 --- intl-win32.c 2005/07/13 04:46:48 1.13.2.2 +++ intl-win32.c 2005/09/23 18:20:42 1.13.2.3 ＠＠ -1550,6 +1550,13 ＠＠ mswindows_locale_to_code_page (LCID UNUS return CP_ACP; } +LCID +mswindows_current_locale (void) +{ + /* In non-MULE version just return the default locale */ + return GetUserDefaultLCID (); +} + #endif /* MULE */  1.3.2.2 +3 -1 XEmacs/xemacs/src/mc-alloc.c Index: mc-alloc.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/mc-alloc.c,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -u -p -r1.3.2.1 -r1.3.2.2 --- mc-alloc.c 2005/07/13 05:48:56 1.3.2.1 +++ mc-alloc.c 2005/09/23 18:20:42 1.3.2.2 ＠＠ -521,7 +521,7 ＠＠ set_lookup_table (void *ptr, page_header MC_MALLOCED_BYTES += malloced_storage_size (0, sizeof (level_2_lookup_tree), 0); #endif - memset (l2, 0, sizeof (level_2_lookup_tree)); + memset (l2, '\0', sizeof (level_2_lookup_tree)); #ifdef USE_HASH_TABLE LEVEL2_HASH_LINK (l2) = PTR_LOOKUP_TABLE (l1_index); #endif ＠＠ -1689,6 +1689,8 ＠＠ void init_mc_allocator (void) { int i; + + memset (&mc_allocator_globals, '\0', sizeof (mc_allocator_globals_type)); for (i = 0; i < N_USED_PAGE_LISTS; i++) {