[PATCH] Update man page for init file, one nroff format error
17 years, 2 months
Shyamal Prasad
Shyamal Prasad
etc/ChangeLog addition:
2004-12-03 Shyamal Prasad <shyamal(a)member.fsf.org>
* xemacs.1: Now describe $HOME/.xemacs/init.el as the
preferred init file. Fixed excessive space insertion
in the description of the '-vanilla' option
XEmacs source patch:
Diff command: cvs -q diff -u
Files affected: etc/xemacs.1
Index: etc/xemacs.1
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/xemacs.1,v
retrieving revision 1.13
diff -u -r1.13 xemacs.1
--- etc/xemacs.1 2001/04/12 18:20:52 1.13
+++ etc/xemacs.1 2004/12/04 01:33:45
＠＠ -147,12 +147,7 ＠＠
.TP
.B \-vanilla
Load no extra files at startup. Equivalent to the combination of
-.B \-q
-,
-.B \-no-site-file
-, and
-.B \-no-early-packages
-\.
+.BR \-q ", " \-no-site-file ", and " \-no-early-packages .
.TP
.BI \-u " user, " \-user " user"
Load
＠＠ -628,7 +623,8 ＠＠
META-left Make a rectangular selection.
.SH FILES
Lisp code is read at startup from the user's init file,
-\fB$HOME/.emacs\fP.
+\fB$HOME/.xemacs/init.el\fP. If this file does not exist then
+\fB$HOME/.emacs\fP will be read if it is present.
/usr/local/info - files for the Info documentation browser
(a subsystem of
- 2 participants
- 1 comments
[PATCH] Synch up format-time-string % specifiers with Emacs 21.3.1
17 years, 2 months
Shyamal Prasad
Shyamal Prasad
This patch adds % specifiers to format-time-string that are missing in
XEmacs but supported by Emacs 21.3.1
src/ChangeLog addition:
2004-12-08 Shyamal Prasad <shyamal(a)member.fsf.org>
* editfns.c:
* editfns.c (Fformat_time_string):
Added documentation for %z, %g, %G and %V specifiers. This synchs
up the set of % specifiers for format-time-string with Emacs
21.3.1. Make copy of static buffer returned by localtime().
* strftime.c:
* strftime.c (strftime):
Implemented %z, %g, %G and %V in a style similar to existing
implementation of other specifiers.
XEmacs source patch:
Diff command: cvs -q diff -u
Files affected: src/strftime.c src/editfns.c
Index: src/editfns.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/editfns.c,v
retrieving revision 1.51
diff -u -r1.51 editfns.c
--- src/editfns.c 2004/12/06 03:52:03 1.51
+++ src/editfns.c 2004/12/09 02:40:17
＠＠ -1015,6 +1015,8 ＠＠
%d is replaced by the day of month, zero-padded.
%D is a synonym for "%m/%d/%y".
%e is replaced by the day of month, blank-padded.
+%G is replaced by the year containing the ISO 8601 week
+%g is replaced by the year of the ISO 8601 week within the century (00-99)
%h is a synonym for "%b".
%H is replaced by the hour (00-23).
%I is replaced by the hour (00-12).
＠＠ -1033,12 +1035,14 ＠＠
%t is a synonym for "\\t".
%T is a synonym for "%H:%M:%S".
%U is replaced by the week of the year (00-53), first day of week is Sunday.
+%V is replaced by the ISO 8601 week number
%w is replaced by the day of week (0-6), Sunday is day 0.
%W is replaced by the week of the year (00-53), first day of week is Monday.
%x is a locale-specific synonym, which defaults to "%D" in the C locale.
%X is a locale-specific synonym, which defaults to "%T" in the C locale.
%y is replaced by the year without century (00-99).
%Y is replaced by the year with century.
+%z is replaced by the time zone as a numeric offset (e.g +0530, -0800 etc.)
%Z is replaced by the time zone abbreviation.
The number of options reflects the `strftime' function.
＠＠ -1063,13 +1067,15 ＠＠
{
Extbyte *buf = alloca_extbytes (size);
Extbyte *formext;
+ /* make a copy of the static buffer returned by localtime() */
+ struct tm tm = * localtime(&value);
+
*buf = 1;
/* !!#### this use of external here is not totally safe, and
potentially data lossy. */
LISP_STRING_TO_EXTERNAL (format_string, formext, Qnative);
- if (emacs_strftime (buf, size, formext,
- localtime (&value))
+ if (emacs_strftime (buf, size, formext, &tm)
|| !*buf)
return build_ext_string (buf, Qnative);
/* If buffer was too small, make it bigger. */
Index: src/strftime.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/strftime.c,v
retrieving revision 1.6
diff -u -r1.6 strftime.c
--- src/strftime.c 2002/03/29 04:48:37 1.6
+++ src/strftime.c 2004/12/09 02:40:18
＠＠ -58,6 +58,7 ＠＠
%S second (00..61)
%T time, 24-hour (hh:mm:ss)
%X locale's time representation (%H:%M:%S)
+ %z time zone offset (e.g. +0530, -0800 etc)
%Z time zone (EDT), or nothing if no time zone is determinable
Date fields:
＠＠ -70,10 +71,13 ＠＠
%d day of month (01..31)
%e day of month ( 1..31)
%D date (mm/dd/yy)
+ %G year corresponding to the ISO 8601 week
+ %g Year of the ISO 8601 week within century (00 - 99)
%h same as %b
%j day of year (001..366)
%m month (01..12)
%U week number of year with Sunday as first day of week (00..53)
+ %V ISO 8601 week number (first week is the earliest one with Thu)
%w day of week (0..6)
%W week number of year with Monday as first day of week (00..53)
%x locale's date representation (mm/dd/yy)
＠＠ -235,6 +239,30 ＠＠
return dl <= 0 ? 0 : dl / 7 + (dl % 7 != 0);
}
+#ifndef __isleap
+/* Nonzero if YEAR is a leap year (every 4 years,
+ except every 100th isn't, and every 400th is). */
+# define __isleap(year) \
+ ((year) % 4 == 0 && ((year) % 100 != 0 || (year) % 400 == 0))
+#endif
+
+/* The number of days from the first day of the first ISO week of this
+ year to the year day YDAY with week day WDAY. ISO weeks start on
+ Monday; the first ISO week has the year's first Thursday. YDAY may
+ be as small as YDAY_MINIMUM. */
+#define ISO_WEEK_START_WDAY 1 /* Monday */
+#define ISO_WEEK1_WDAY 4 /* Thursday */
+#define YDAY_MINIMUM (-366)
+static int
+iso_week_days (int yday, int wday)
+{
+ /* Add enough to the first operand of % to make it nonnegative. */
+ int big_enough_multiple_of_7 = (-YDAY_MINIMUM / 7 + 2) * 7;
+ return (yday
+ - (yday - wday + ISO_WEEK1_WDAY + big_enough_multiple_of_7) % 7
+ + ISO_WEEK1_WDAY - ISO_WEEK_START_WDAY);
+}
+
#if !defined(HAVE_TM_ZONE) && !defined(HAVE_TZNAME)
char *zone_name (const struct tm *tp);
char *
＠＠ -362,10 +390,125 ＠＠
length +=
strftime (&string[length], max - length, "%H:%M:%S", tm);
break;
+
+ case 'V':
+ case 'g':
+ case 'G':
+ {
+ int year = tm->tm_year + 1900;
+ int days = iso_week_days (tm->tm_yday, tm->tm_wday);
+
+ if (days < 0)
+ {
+ /* This ISO week belongs to the previous year. */
+ year--;
+ days =
+ iso_week_days (tm->tm_yday + (365 + __isleap (year)),
+ tm->tm_wday);
+ }
+ else
+ {
+ int d =
+ iso_week_days (tm->tm_yday - (365 + __isleap (year)),
+ tm->tm_wday);
+ if (0 <= d)
+ {
+ /* This ISO week belongs to the next year. */
+ year++;
+ days = d;
+ }
+ }
+
+ switch (*format)
+ {
+ /*
+ #### FIXME
+ We really can't assume 1000 <= year <= 9999
+ once time_t gets beyond 32 bits, but it's true
+ of the rest of the code here so get with the
+ program
+ */
+ case 'g':
+ length +=
+ add_num2 (&string[length], year % 100,
+ max - length, pad);
+ break;
+
+ case 'G':
+ add_char (year / 1000 + '0');
+ length += add_num3 (&string[length], year % 1000,
+ max - length, zero);
+ break;
+
+ default:
+ length +=
+ add_num2 (&string[length], days / 7 + 1,
+ max - length, pad);
+ break;
+ }
+ }
+ break;
case 'X':
length +=
strftime (&string[length], max - length, "%H:%M:%S", tm);
break;
+ case 'z':
+ {
+ /*
+ #### FIXME: could use tm->tm_gmtoff if present. Since
+ the other code in xemacs does not do so we follow the
+ leaders (and don't add a autoconf macro to detect
+ its presence).
+ */
+ long int offset;
+ long int minutes;
+ struct tm lt, *ut;
+ time_t utc;
+
+ lt = *tm;
+ utc = mktime(<);
+ ut = gmtime(&utc);
+ /* assume that tm is valid so the others will be too! */
+ assert( utc != (time_t) -1 && ut != NULL );
+
+ /* tm diff code below is based on mktime.c, glibc 2.3.2 */
+ {
+ int lt4, ut4, lt100, ut100, lt400, ut400;
+ int intervening_leap_days, years, days;
+
+ lt4 = (lt.tm_year >> 2) + (1900 >> 2) -
+ ! (lt.tm_year & 3);
+ ut4 = (ut->tm_year >> 2) + (1900 >> 2) -
+ ! (ut->tm_year & 3);
+ lt100 = lt4 / 25 - (lt4 % 25 < 0);
+ ut100 = ut4 / 25 - (ut4 % 25 < 0);
+ lt400 = lt100 >> 2;
+ ut400 = ut100 >> 2;
+ intervening_leap_days =
+ (lt4 - ut4) - (lt100 - ut100) + (lt400 - ut400);
+ years = lt.tm_year - ut->tm_year;
+ days = (365 * years + intervening_leap_days
+ + (lt.tm_yday - ut->tm_yday));
+ offset = (60 * (60 * (24 * days + (lt.tm_hour - ut->tm_hour))
+ + (lt.tm_min - ut->tm_min))
+ + (lt.tm_sec - ut->tm_sec));
+ }
+
+ minutes = offset / ( offset < 0 ? -60 : 60 );
+
+ add_char ((offset < 0 ? '-' : '+'));
+
+ if ( minutes / 600 != 0 )
+ add_char (minutes / 600 + '0');
+ else if ( pad != none )
+ add_char ((pad == zero ? '0' : ' '));
+
+ length +=
+ add_num3 (&string[length],
+ ((minutes / 60 ) % 10) * 100 + (minutes % 60),
+ max - length, pad);
+ break;
+ }
case 'Z':
#ifdef HAVE_TM_ZONE
length += add_str (&string[length], tm->tm_zone, max - length);
- 2 participants
- 1 comments
21.5 patch [Re: 21.4.{17,18} configure.in and ldap]
18 years, 9 months
Ilya N. Golubev
Ilya N. Golubev
21.5 had the same combination of lossages, both in upstream and in my
branch, so the patch for it should also be interesting to users.
Posting it. Posting the patch to 21.4 in another message.
./
2005-12-17 Ilya N. Golubev <gin(a)mo.msk.ru>
* configure.ac: Avoid inadvertent use of cached test results the
same way as did in `configure.in' for autoconf 2.13. As an
additional defense, use `$as_unset' from 2.59.
2005-12-16 Ilya N. Golubev <gin(a)mo.msk.ru>
* configure.ac: Fixed `LDAP_OPT_ON' libraries configuration
introduced in local 2004-12-20 change of `configure.in'. However,
do not check for internal `-lber' `ber_pvt_opt_on' symbol as done
in upstream. This symbol is not part of any published interface,
it may exist or not exist, depending on openldap version. Cryptic
comment before using it in upstream source did not state precisely
under which circumstances checking for it was useful, which sort
of user code tried to link the symbol. So on 2004-12-20 dismissed
both the code and the comment without writing a cleaner
equivalent.
2004-12-20 Ilya N. Golubev <gin(a)mo.msk.ru>
* configure.in: Fix ldap libraries configuration lossage when
`-lldap -llber' links and but `-lldap' does not; the lossage was
introduced in revision 1.232. Also allow `ldap_libs' to be empty
or overridden by builder.
etc/
2005-12-16 Ilya N. Golubev <gin(a)mo.msk.ru>
* NEWS: Document fix of `LDAP_OPT_ON' libraries configuration.
2005-03-13 Ilya N. Golubev <gin(a)mo.msk.ru>
* NEWS: Document recent `configure' fixes.
--- configure.ac 2005-11-29 22:15:44.000000000 +0300
+++ configure.ac 2005-12-17 23:11:21.610953520 +0300
＠＠ -103,6 +103,14 ＠＠
dnl PRINT_VAR(var var ...) prints values of shell variables
define([PRINT_VAR],[for var in patsubst([$1],[[
]+],[ ]); do eval "echo \"$var = '\$$var'\""; done])dnl
+dnl Disable cache files:
+dnl This is controversial. So is the idea behind caching test results
+dnl that it is better to be broken than to be slow. With caching as
+dnl it is currently implemented in autoconf there are too many
+dnl surprises.
+define([AC_CACHE_VAL], [
+$2
+])dnl
dnl
dnl XE_ADD_OBJS(foo.o)
define([XE_ADD_OBJS],
＠＠ -3403,10 +3411,12 ＠＠
do
if test -d $freetype_include_top; then
AC_CHECKING([in ${freetype_include_top}/freetype2])
- dnl disable autoconf's fucking cache; why these fuckheads think it
- dnl is better to be broken than to be slow, I don't know!
- dnl #### there's gotta be a better-looking way to do this!!
- unset "$as_ac_Header"
+dnl Using `$as_unset' from autoconf internals as another defense
+dnl against inadvertent use of cached test results. Do not using full
+dnl `AS_UNSET': the standard autoconf caching checks for variable
+dnl being exactly unset, and setting it to any value is useless;
+dnl exporting cache variables is just never needed.
+ $as_unset "$as_ac_Header"
save_c_switch_site="$c_switch_site"
c_switch_site="$c_switch_site -I${freetype_include_top}"
AC_CHECK_HEADERS([freetype/config/ftheader.h],
＠＠ -3794,36 +3804,132 ＠＠
dnl Autodetect LDAP
AC_CHECKING([for LDAP])
-ldap_libs=
test -z "$with_ldap" && { AC_CHECK_HEADER(ldap.h, ,with_ldap=no) }
test -z "$with_ldap" && { AC_CHECK_HEADER(lber.h, ,with_ldap=no) }
-if test "$with_ldap" != "no"; then
- AC_CHECK_LIB(ldap, ldap_search, with_ldap=yes)
- dnl Check for other libraries we need to link with to get the main routines.
- test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, ldap_open, [with_ldap=yes with_ldap_lber=yes], , -llber) }
- test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, ldap_open, [with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes], , -llber -lkrb) }
- test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, ldap_open, [with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes with_ldap_des=yes], , -llber -lkrb -ldes) }
- dnl Recently, we need -lber even though the main routines are elsewhere,
- dnl because otherwise be get link errors w.r.t. ber_pvt_opt_on. So just
- dnl check for that (it's a variable not a fun but that doesn't seem to
- dnl matter in these checks) and stick in -lber if so. Can't hurt (even to
- dnl stick it in always shouldn't hurt, I don't think) ... #### Someone who
- dnl #### understands LDAP needs to fix this properly.
- test "$with_ldap_lber" != "yes" && { AC_CHECK_LIB(lber, ber_pvt_opt_on, with_ldap_lber=yes) }
+if test no != "$with_ldap";then
+ if test . != "${ldap_libs+.}";then
+ ldap_libs=
+ AC_CHECK_FUNC(ldap_open,dnl Allow it to be in generic "$LIBS"
+ [with_ldap=yes
+ test yes = "$extra_verbose" &&
+ echo "Setting ldap_libs to $ldap_libs"],dnl
+ [AC_CHECK_LIB(ldap, ldap_open,dnl
+ [with_ldap=yes],dnl
+dnl If logic of setting these vars change, change it the same way below.
+ [ldap_needs_lber=yes ldap_other_libs=-llber
+dnl This requires `AC_CACHE_VAL' (which is called by `AC_CHECK_LIB')
+dnl to be redefined to ignore cached (shell variable) value, as it is
+dnl done above, because the same variable is used in all
+dnl `AC_CHECK_LIB' expansions in macro invocation below. Worse, if it
+dnl is not done, there is no portable way to compensate for this
+dnl locally since `unset' command is not supported by all shells. The
+dnl other solution would be changing `AC_CHECK_LIB' so that cache
+dnl variable name depends on the macro OTHER-LIBRARIES argument.
+dnl
+dnl See comment on `$as_unset "$as_ac_Header"'.
+ $as_unset ac_cv_lib_ldap_ldap_open
+ AC_CHECK_LIB(ldap, ldap_open,dnl
+ [with_ldap=yes],dnl
+ [ldap_needs_krb=yes ldap_other_libs="$ldap_other_libs -lkrb"
+ $as_unset ac_cv_lib_ldap_ldap_open
+ AC_CHECK_LIB(ldap, ldap_open,dnl
+ [with_ldap=yes],dnl
+ [ldap_needs_des=yes ldap_other_libs="$ldap_other_libs -ldes"
+ $as_unset ac_cv_lib_ldap_ldap_open
+ AC_CHECK_LIB(ldap, ldap_open,dnl
+ [with_ldap=yes],dnl
+ [with_ldap=no],dnl
+ $ldap_other_libs)],dnl
+ $ldap_other_libs)],dnl
+ $ldap_other_libs)])
+ if test yes = "$with_ldap" -a yes != "$ldap_needs_lber";then
+dnl Need this check since `LDAP_OPT_ON' is (currently) used only with
+dnl `ldap_set_option', and the latter may not exist at all, for which
+dnl is testing later. So `LDAP_OPT_ON' is not necessarily defined.
+ AC_CACHE_CHECK([for LDAP_OPT_ON definition],xe_cv_have_LDAP_OPT_ON,
+ [AC_COMPILE_IFELSE(
+ AC_LANG_SOURCE(
+[[#include <lber.h>
+#include <ldap.h>
+#ifdef LDAP_OPT_ON
+/* Relying on const defined by ac_c_const (upper case). */
+const void *const v = LDAP_OPT_ON;
+#else /* !defined (LDAP_OPT_ON) */
+choke me
+#endif /* !defined (LDAP_OPT_ON) */]]),
+ [xe_cv_have_LDAP_OPT_ON=yes],
+ [xe_cv_have_LDAP_OPT_ON=no])])
+ if test yes = "$xe_cv_have_LDAP_OPT_ON";then
+ AC_CACHE_CHECK([LDAP_OPT_ON linking],
+ xe_cv_LDAP_OPT_ON_links,
+ [xe_save_LIBS="$LIBS"
+ LIBS="-lldap $LIBS"
+AC_LINK_IFELSE(
+AC_LANG_PROGRAM(
+[[#include <lber.h>
+#include <ldap.h>
+const void *const v = LDAP_OPT_ON;]],
+[[int
+main ()
+{
+ return 0;
+}]]),
+ xe_cv_LDAP_OPT_ON_links=yes,
+ xe_cv_LDAP_OPT_ON_links=no)
+ LIBS="$xe_save_LIBS"])
+dnl In some openldap installations other `ldap_*' functions link with
+dnl `-lldap' alone, but `LDAP_OPT_ON' requires `-llber'.
+ if test yes != "$xe_cv_LDAP_OPT_ON_links";then
+ ldap_needs_lber=yes ldap_other_libs=-llber
+ AC_CACHE_CHECK([LDAP_OPT_ON linking with -llber],
+ xe_cv_LDAP_OPT_ON_links_w_lber,
+ [xe_save_LIBS="$LIBS"
+ LIBS="-lldap $ldap_other_libs $LIBS"
+AC_LINK_IFELSE(
+AC_LANG_PROGRAM(
+[[#include <lber.h>
+#include <ldap.h>
+const void *const v = LDAP_OPT_ON;]],
+[[int
+main ()
+{
+ return 0;
+}]]),
+ xe_cv_LDAP_OPT_ON_links_w_lber=yes,
+ xe_cv_LDAP_OPT_ON_links_w_lber=no)
+ LIBS="$xe_save_LIBS"])
+ if test yes != "$xe_cv_LDAP_OPT_ON_links_w_lber";then
+ with_ldap=no
+ fi
+ fi
+ fi
+ fi
+ if test yes = "$with_ldap";then
+ if test yes = "$ldap_needs_des";then
+ XE_PREPEND(-ldes, ldap_libs)
+ fi
+ if test yes = "$ldap_needs_krb";then
+ XE_PREPEND(-lkrb, ldap_libs)
+ fi
+ if test yes = "$ldap_needs_lber";then
+ XE_PREPEND(-llber, ldap_libs)
+ fi
+ XE_PREPEND(-lldap, ldap_libs)
+ fi])
+ else
+dnl Allow builder to override "$ldap_libs".
+ save_LIBS="$LIBS" LIBS="$ldap_libs $LIBS"
+ AC_CHECK_FUNC(ldap_open,dnl
+ [with_ldap=yes
+ test yes = "$extra_verbose" &&
+ echo "Setting ldap_libs to $ldap_libs"],dnl
+ [with_ldap=no])
+ LIBS="$save_LIBS"
+ fi
fi
if test "$with_ldap" = "yes"; then
AC_DEFINE(HAVE_LDAP)
- if test "$with_ldap_des" = "yes" ; then
- XE_PREPEND(-ldes, ldap_libs)
- fi
- if test "$with_ldap_krb" = "yes" ; then
- XE_PREPEND(-lkrb, ldap_libs)
- fi
- if test "$with_ldap_lber" = "yes" ; then
- XE_PREPEND(-llber, ldap_libs)
- fi
- XE_PREPEND(-lldap, ldap_libs)
- save_LIBS="$LIBS" LIBS="$LIBS $ldap_libs"
+ save_LIBS="$LIBS" LIBS="$ldap_libs $LIBS"
AC_CHECK_FUNCS(ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result)
LIBS="$save_LIBS"
XE_APPEND(modules/ldap, MAKE_SUBDIR)
--- etc/NEWS 2005-07-18 23:35:16.000000000 +0400
+++ etc/NEWS 2005-12-16 04:48:25.265284776 +0300
＠＠ -36,6 +36,8 ＠＠
-- Windows users have benefit of the full Win32 Unicode API.
-- (in process) Xft provides antialiased fonts on X11.
-- "XEmacs" used as X11 application class
+ -- Fixed ldap libraries configuration.
+ -- Fixed `LDAP_OPT_ON' libraries configuration.
** Bignum implementation.
＠＠ -56,6 +58,20 ＠＠
course of the next major release, though, so you will have to migrate your
resources at some point.
+** Fixed ldap libraries configuration.
+
+It used to fail when `-lldap' requires `-llber'. Introduced in
+upstream `configure.in' revision 1.232 (2004/11/04 23:05:33 +0).
+
+*** Fixed `LDAP_OPT_ON' libraries configuration.
+
+The original fix of local `configure.in' revision 1.19 (2004/12/19
+21:10:02 +0) introduced lossage on another class of systems. In some
+openldap versions `ldap_*' functions may link successfully without
+`-lber', but compiling and linking program with `LDAP_OPT_ON' may
+require `-lber'. When configuring ldap libraries, check for such
+systems, and in a cleaner way than in upstream.
+
* Lisp and internal changes in XEmacs 21.5
==========================================
- 2 participants
- 3 comments
list-mode.el patch
18 years, 9 months
David A. Panariti
David A. Panariti
XEmacs 21.5 (beta24) "dandelion" [Lucid] (i686-pc-linux, Mule) of Thu Dec 29
2005 on vilya
Fixes a bug in completion buffers that prevented me from using the keyboard
to move between completions. Almost everything ended up putting point at the
end of the last completion (and at point-max) It seems that something rather
fundamental has changed. Completion mode is derived from list-mode.
list-mode uses properties to track/locate list items (it seems, I don't fully
understand the code.) The next and previous functions worked by moving point
until the properties changed. The properties put on the items were not text
properties but the functions used to move over properties were ones that only
worked with text properties. I changed the functions called to ones that
work with non-text properties.
As a point of information for me: this is dumped lisp code for a beta
version. Should this be posted here or to xemacs-beta?
regards,
--
/ Default, n.:
davep (|) The hardware's, of course.
/
$
--- list-mode.el.ORIG 2005-12-29 17:02:58.000000000 -0500
+++ list-mode.el 2005-12-29 17:06:04.000000000 -0500
＠＠ -174,8 +174,8 ＠＠
(if extent (goto-char (extent-end-position extent)))
;; Move to start of next one.
(or (extent-at (point) (current-buffer) 'list-mode-item)
- (goto-char (next-single-property-change (point) 'list-mode-item
- nil end))))
+ (goto-char (next-single-char-property-change (point) 'list-mode-item
+ nil end))))
(setq n (1- n)))
(while (and (< n 0) (not (bobp)))
(let ((extent (extent-at (point) (current-buffer) 'list-mode-item))
＠＠ -186,7 +186,7 ＠＠
(if (setq extent (extent-at (point) (current-buffer) 'list-mode-item
nil 'before))
(goto-char (extent-start-position extent))
- (goto-char (previous-single-property-change
+ (goto-char (previous-single-char-property-change
(point) 'list-mode-item nil end))
(if (setq extent (extent-at (point) (current-buffer) 'list-mode-item
nil 'before))
＠＠ -648,7 +648,7 ＠＠
(if (not (get-buffer-window "*Completions*"))
nil
(select-window (get-buffer-window "*Completions*"))
- (goto-char (next-single-property-change (point-min) 'list-mode-item nil
- (point-max)))))
+ (goto-char (next-single-char-property-change
+ (point-min) 'list-mode-item nil (point-max)))))
;;; list-mode.el ends here
2005-12-29 David A. Panariti <davep.xemacs(a)meduseld.net>
* list-mode.el (next-list-mode-item):
Changed calls to {next|previous}-single-property-change to
{next|previous}-single-char-property-change. The previous and next
list item commands were not working: they always sent you to the
end of the buffer since the properties on the list items were not
text properties, and {next|previous}-single-property-change only
look for changes in text properties.
- 2 participants
- 1 comments
[PATCH21.5] Asynchronous finalization
18 years, 10 months
Marcus Crestani
Marcus Crestani
This patch introduces an asynchronous finalization strategy on
C level.
With this patch the severe NEW_GC finalization bug (especially the
lstream finalization problem) is gone, at least in my tests.
Therefore, I'd like to call for another round of tests with
`--enable-newgc' on all the systems out there!
Here are the details:
Currently, XEmacs's finalizers run synchronously during a garbage
collection, just before the sweep phase. Since the finalizers run
while still in the middle of the collection, special care has to be
taken how finalizers are written and what actions they take. This can
easily cause errors, and it obviously does for lstream finalization in
combination with the incremental garbage collector.
Therefore, it is better to have the finalizers run asynchronously
after a garbage collection. XEmacs already has an asynchronous
finalization mechanism, the post-gc-hook, currently only used to run
finalizers on the Lisp level for the ephemeron Lisp object.
To have all finalizers run asynchronously on the C level, I change the
post_gc_action semantics: Instead of calling run_post_gc_action at the
end of a garbage collection, I postpone the call to the next eval
call, just like post-gc-hook works.
Additionally, I make sure that every Lisp object is finalized only
once: Therefore, each Lisp object gets a new bit called `finalize'
that is initialized to 1 if the according lrecord_implementation
contains a finalizer function. The finalizer only executes when
`finalize' is set, and the finalizer unsets the bit after the object
is finalized.
The garbage collector enqueues the finalizer for later execution via
add_post_gc_action instead of calling the finalizer on the object
directly, and the object is not freed in this garbage collection
cycle. The next time when eval is called, the finalizers run; the
next time when a collection runs, the objects are freed.
Note that I did not conditionalize these changes on MC_ALLOC or
NEW_GC: With this patch, the old garbage collector also uses
asynchronous finalization. In my opinion, this does not hurt: No
speed penalty, only a slightly bigger memory overhead, and it makes
finalization bullet proof.
I'll commit end of next week, if nobody objects or comes up with
suggestions.
src/ChangeLog addition:
2006-01-21 Marcus Crestani <crestani(a)xemacs.org>
* alloc.c (finalize_string): Use finalize bit.
* alloc.c (sweep_lcrecords_1): Register finalizer as post gc
action if it has to be finalized instead of call it directly.
* buffer.c (DEFVAR_BUFFER_LOCAL_1): Set finalize bit.
* bytecode.c (finalize_compiled_function): Use finalize bit.
* console.c (DEFVAR_CONSOLE_LOCAL_1): Set finalize bit.
* database.c (finalize_database): Use finalize bit.
* device-msw.c (finalize_devmode): Use finalize bit.
* elhash.c: NEW_GC does not need a finalizer for hash tables.
* elhash.c (finalize_hash_table): Use finalize bit.
* eval.c (Ffuncall): Add run_post_gc_actions here.
* event-stream.c (finalize_command_builder): Use finalize bit.
* extents.c (finalize_extent_info): Use finalize bit.
* file-coding.c (finalize_coding_system): Use finalize bit.
* gc.c (struct post_gc_action): Add for_disksave argument to post-gc
function.
* gc.c (register_post_gc_action): Add for_disksave argument.
* gc.c (run_post_gc_actions): Call finalizer with for_disksave
argument.
* gc.c (gc_finish): Remove synchronous run_post_gc_actions call,
move it eval.c.
* glyphs-msw.c (finalize_destroy_window): Add for_disksave
argument.
* glyphs.c (finalize_image_instance): Use finalize bit.
* gui.c: Remove unused finalize_gui_item.
* lisp.h: Add run_post_gc_actions, add for_disksave argument.
* lisp.h (struct Lisp_String): Add finalize bit, adjust other
bit fields.
* lisp.h (DEFUN_NORETURN): Add finalize bit.
* lisp.h (DEFUN): Add finalize bit.
* lrecord.h: Add finalize bit accessor macros.
* lrecord.h (struct lrecord_header): Add finalize bit, adjust
other bit fields.
* lrecord.h (set_lheader_implementation): Initialize finalize bit
according to the finalizer field in the lrecord implementation of
the lrecord.
* lrecord.h (MC_ALLOC_REGISTER_FINALIZER): New.
* lstream.c (finalize_lstream): Use finalize bit.
* marker.c (finalize_marker): Use finalize bit.
* mc-alloc.c (remove_cell): Set finalize bit to avoid finalization
of an already freed object.
* mc-alloc.c (finalize_page): Register finalizer as post gc action
instead of call it directly, keep objects that need to be
finalized alive for now..
* objects.c (finalize_color_instance): Use finalize bit.
* objects.c (finalize_font_instance): Use finalize bit.
* process.c (finalize_process): Use finalize bit.
* scrollbar-msw.c (unshow_that_mofo): Add for_disksave argument.
* specifier.c (finalize_specifier): Use finalize bit, remove
unneeded mc_free call.
* symbols.c (guts_of_unbound_marker): Add finalize bit.
* symeval.h (DEFVAR_SYMVAL_FWD): Add finalize bit.
* window.c (finalize_window): Use finalize bit, use for_disksave.
* xft-fonts.c (finalize_fc_pattern): Add for_disksave argument,
use finalize bit.
xemacs-21.5 source patch:
Diff command: cvs -q diff -u
Files affected: src/xft-fonts.c src/window.c src/symeval.h src/symbols.c src/specifier.c src/scrollbar-msw.c src/process.c src/objects.c src/mc-alloc.c src/marker.c src/lstream.c src/lrecord.h src/lisp.h src/gui.c src/glyphs.c src/glyphs-msw.c src/gc.c src/file-coding.c src/extents.c src/event-stream.c src/eval.c src/elhash.c src/device-msw.c src/database.c src/console.c src/bytecode.c src/buffer.c src/alloc.c
Index: src/alloc.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/alloc.c,v
retrieving revision 1.122
diff -u -r1.122 alloc.c
--- src/alloc.c 25 Dec 2005 11:21:46 -0000 1.122
+++ src/alloc.c 21 Jan 2006 10:42:26 -0000
＠＠ -2355,10 +2355,12 ＠＠
{
if (!for_disksave)
{
+ if (!LRECORD_FINALIZE_P (header)) return;
Lisp_String *s = (Lisp_String *) header;
Bytecount size = s->size_;
if (BIG_STRING_SIZE_P (size))
xfree (s->data_, Ibyte *);
+ SET_LRECORD_NOT_FINALIZE (header);
}
}
＠＠ -3500,10 +3502,15 ＠＠
GC_CHECK_LHEADER_INVARIANTS (h);
- if (! MARKED_RECORD_HEADER_P (h) && ! header->free)
+ if (! MARKED_RECORD_HEADER_P (h) && ! header->free
+ && LRECORD_FINALIZE_P (h))
{
if (LHEADER_IMPLEMENTATION (h)->finalizer)
- LHEADER_IMPLEMENTATION (h)->finalizer (h, 0);
+ {
+ register_post_gc_action
+ (LHEADER_IMPLEMENTATION (h)->finalizer, (void *) h);
+ MARK_RECORD_HEADER (h);
+ }
}
}
Index: src/buffer.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/buffer.c,v
retrieving revision 1.75
diff -u -r1.75 buffer.c
--- src/buffer.c 17 Dec 2005 21:04:16 -0000 1.75
+++ src/buffer.c 21 Jan 2006 10:42:28 -0000
＠＠ -2137,7 +2137,6 ＠＠
struct symbol_value_forward *I_hate_C = \
alloc_lrecord_type (struct symbol_value_forward, \
&lrecord_symbol_value_forward); \
- /*mcpro ((Lisp_Object) I_hate_C);*/ \
\
I_hate_C->magic.value = &(buffer_local_flags.field_name); \
I_hate_C->magic.type = forward_type; \
＠＠ -2166,6 +2165,7 ＠＠
{ /* struct old_lcrecord_header */ \
{ /* struct lrecord_header */ \
lrecord_type_symbol_value_forward, /* lrecord_type_index */ \
+ 0, /* finalize bit */ \
1, /* mark bit */ \
1, /* c_readonly bit */ \
1 /* lisp_readonly bit */ \
Index: src/bytecode.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/bytecode.c,v
retrieving revision 1.48
diff -u -r1.48 bytecode.c
--- src/bytecode.c 25 Nov 2005 01:41:56 -0000 1.48
+++ src/bytecode.c 21 Jan 2006 10:42:29 -0000
＠＠ -2253,10 +2253,12 ＠＠
{
if (!for_disksave)
{
+ if (!LRECORD_FINALIZE_P (header)) return;
struct Lisp_Compiled_Function *cf =
(struct Lisp_Compiled_Function *) header;
if (cf->args_in_array)
xfree (cf->args, Lisp_Object *);
+ SET_LRECORD_NOT_FINALIZE (header);
}
}
Index: src/console.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/console.c,v
retrieving revision 1.46
diff -u -r1.46 console.c
--- src/console.c 18 Dec 2005 11:44:28 -0000 1.46
+++ src/console.c 21 Jan 2006 10:42:30 -0000
＠＠ -1331,7 +1331,6 ＠＠
struct symbol_value_forward *I_hate_C = \
alloc_lrecord_type (struct symbol_value_forward, \
&lrecord_symbol_value_forward); \
- /*mcpro ((Lisp_Object) I_hate_C);*/ \
\
I_hate_C->magic.value = &(console_local_flags.field_name); \
I_hate_C->magic.type = forward_type; \
＠＠ -1358,6 +1357,7 ＠＠
{ /* struct old_lcrecord_header */ \
{ /* struct lrecord_header */ \
lrecord_type_symbol_value_forward, /* lrecord_type_index */ \
+ 0, /* finalize bit */ \
1, /* mark bit */ \
1, /* c_readonly bit */ \
1 /* lisp_readonly bit */ \
Index: src/database.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/database.c,v
retrieving revision 1.38
diff -u -r1.38 database.c
--- src/database.c 16 Nov 2005 07:22:46 -0000 1.38
+++ src/database.c 21 Jan 2006 10:42:30 -0000
＠＠ -185,6 +185,7 ＠＠
{
Lisp_Database *db = (Lisp_Database *) header;
+ if (!for_disksave && !LRECORD_FINALIZE_P (header)) return;
if (for_disksave)
{
invalid_operation
＠＠ -192,6 +193,7 ＠＠
wrap_database (db));
}
db->funcs->close (db);
+ if (!for_disksave) SET_LRECORD_NOT_FINALIZE (header);
}
DEFINE_LRECORD_IMPLEMENTATION ("database", database,
Index: src/device-msw.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/device-msw.c,v
retrieving revision 1.60
diff -u -r1.60 device-msw.c
--- src/device-msw.c 25 Nov 2005 01:41:58 -0000 1.60
+++ src/device-msw.c 21 Jan 2006 10:42:31 -0000
＠＠ -1169,6 +1169,7 ＠＠
{
Lisp_Devmode *dm = (Lisp_Devmode *) header;
+ if (!for_disksave && !LRECORD_FINALIZE_P (header)) return;
if (for_disksave)
{
Lisp_Object devmode = wrap_devmode (dm);
＠＠ -1179,6 +1180,7 ＠＠
}
assert (NILP (dm->device));
+ if (!for_disksave) SET_LRECORD_NOT_FINALIZE (header);
}
static int
Index: src/elhash.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/elhash.c,v
retrieving revision 1.44
diff -u -r1.44 elhash.c
--- src/elhash.c 25 Nov 2005 01:42:00 -0000 1.44
+++ src/elhash.c 21 Jan 2006 10:42:32 -0000
＠＠ -443,16 +443,20 ＠＠
#endif /* not NEW_GC */
}
+#ifndef NEW_GC
static void
finalize_hash_table (void *header, int for_disksave)
{
if (!for_disksave)
{
+ if (!LRECORD_FINALIZE_P (header)) return;
Lisp_Hash_Table *ht = (Lisp_Hash_Table *) header;
free_hentries (ht->hentries, ht->size);
ht->hentries = 0;
+ SET_LRECORD_NOT_FINALIZE (header);
}
}
+#endif /* not NEW_GC */
static const struct memory_description htentry_description_1[] = {
{ XD_LISP_OBJECT, offsetof (htentry, key) },
＠＠ -515,6 +519,14 ＠＠
{ XD_END }
};
+#ifdef NEW_GC
+DEFINE_LRECORD_IMPLEMENTATION ("hash-table", hash_table,
+ 1, /*dumpable-flag*/
+ mark_hash_table, print_hash_table,
+ 0, hash_table_equal, hash_table_hash,
+ hash_table_description,
+ Lisp_Hash_Table);
+#else /* not NEW_GC */
DEFINE_LRECORD_IMPLEMENTATION ("hash-table", hash_table,
1, /*dumpable-flag*/
mark_hash_table, print_hash_table,
＠＠ -522,6 +534,7 ＠＠
hash_table_equal, hash_table_hash,
hash_table_description,
Lisp_Hash_Table);
+#endif /* not NEW_GC */
static Lisp_Hash_Table *
xhash_table (Lisp_Object hash_table)
Index: src/eval.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/eval.c,v
retrieving revision 1.91
diff -u -r1.91 eval.c
--- src/eval.c 25 Nov 2005 01:42:00 -0000 1.91
+++ src/eval.c 21 Jan 2006 10:42:36 -0000
＠＠ -3835,6 +3835,7 ＠＠
{
need_to_signal_post_gc = 0;
recompute_funcall_allocation_flag ();
+ run_post_gc_actions ();
run_post_gc_hook ();
}
}
Index: src/event-stream.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/event-stream.c,v
retrieving revision 1.92
diff -u -r1.92 event-stream.c
--- src/event-stream.c 25 Oct 2005 11:16:23 -0000 1.92
+++ src/event-stream.c 21 Jan 2006 10:42:38 -0000
＠＠ -360,11 +360,13 ＠＠
if (!for_disksave)
{
struct command_builder *b = (struct command_builder *) header;
+ if (!LRECORD_FINALIZE_P (header)) return;
if (b->echo_buf)
{
xfree (b->echo_buf, Ibyte *);
b->echo_buf = 0;
}
+ SET_LRECORD_NOT_FINALIZE (header);
}
}
Index: src/extents.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/extents.c,v
retrieving revision 1.63
diff -u -r1.63 extents.c
--- src/extents.c 25 Nov 2005 01:42:01 -0000 1.63
+++ src/extents.c 21 Jan 2006 10:42:43 -0000
＠＠ -1277,6 +1277,7 ＠＠
if (for_disksave)
return;
+ if (!LRECORD_FINALIZE_P (header)) return;
#ifdef NEW_GC
data->soe = 0;
data->extents = 0;
＠＠ -1292,6 +1293,7 ＠＠
data->extents = 0;
}
#endif /* not NEW_GC */
+ SET_LRECORD_NOT_FINALIZE (header);
}
DEFINE_LRECORD_IMPLEMENTATION ("extent-info", extent_info,
Index: src/file-coding.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/file-coding.c,v
retrieving revision 1.50
diff -u -r1.50 file-coding.c
--- src/file-coding.c 17 Dec 2005 19:47:03 -0000 1.50
+++ src/file-coding.c 21 Jan 2006 10:42:45 -0000
＠＠ -313,7 +313,11 ＠＠
necessary. But it would be necessary if we changed things
so that coding systems could go away. */
if (!for_disksave) /* see comment in lstream.c */
- MAYBE_XCODESYSMETH (cs, finalize, (cs));
+ {
+ if (!LRECORD_FINALIZE_P (header)) return;
+ MAYBE_XCODESYSMETH (cs, finalize, (cs));
+ SET_LRECORD_NOT_FINALIZE (header);
+ }
}
static Bytecount
Index: src/gc.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/gc.c,v
retrieving revision 1.1
diff -u -r1.1 gc.c
--- src/gc.c 25 Nov 2005 01:42:03 -0000 1.1
+++ src/gc.c 21 Jan 2006 10:42:46 -0000
＠＠ -1339,7 +1339,7 ＠＠
struct post_gc_action
{
- void (*fun) (void *);
+ void (*fun) (void *, int);
void *arg;
};
＠＠ -1362,7 +1362,7 ＠＠
*/
void
-register_post_gc_action (void (*fun) (void *), void *arg)
+register_post_gc_action (void (*fun) (void *, int), void *arg)
{
post_gc_action action;
＠＠ -1375,7 +1375,7 ＠＠
Dynarr_add (post_gc_actions, action);
}
-static void
+void
run_post_gc_actions (void)
{
int i;
＠＠ -1385,7 +1385,7 ＠＠
for (i = 0; i < Dynarr_length (post_gc_actions); i++)
{
post_gc_action action = Dynarr_at (post_gc_actions, i);
- (action.fun) (action.arg);
+ (action.fun) (action.arg, 0);
}
Dynarr_reset (post_gc_actions);
＠＠ -1738,8 +1738,6 ＠＠
inhibit_non_essential_conversion_operations = 0;
#endif /* not NEW_GC */
gc_in_progress = 0;
-
- run_post_gc_actions ();
/******* End of garbage collection ********/
Index: src/glyphs-msw.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/glyphs-msw.c,v
retrieving revision 1.56
diff -u -r1.56 glyphs-msw.c
--- src/glyphs-msw.c 27 Sep 2005 05:48:26 -0000 1.56
+++ src/glyphs-msw.c 21 Jan 2006 10:42:48 -0000
＠＠ -1737,7 +1737,7 ＠＠
#endif
static void
-finalize_destroy_window (void *win)
+finalize_destroy_window (void *win, int UNUSED (for_disksave))
{
DestroyWindow ((HWND) win);
}
Index: src/glyphs.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/glyphs.c,v
retrieving revision 1.55
diff -u -r1.55 glyphs.c
--- src/glyphs.c 25 Nov 2005 01:42:04 -0000 1.55
+++ src/glyphs.c 21 Jan 2006 10:42:51 -0000
＠＠ -1123,6 +1123,7 ＠＠
return;
if (for_disksave) finalose (i);
+ if (!for_disksave && !LRECORD_FINALIZE_P (header)) return;
/* We can't use the domain here, because it might have
disappeared. */
MAYBE_DEVMETH (XDEVICE (IMAGE_INSTANCE_DEVICE (i)),
＠＠ -1130,6 +1131,7 ＠＠
/* Make sure we don't try this twice. */
IMAGE_INSTANCE_DEVICE (i) = Qnil;
+ if (!for_disksave) SET_LRECORD_NOT_FINALIZE (header);
}
static int
Index: src/gui.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/gui.c,v
retrieving revision 1.31
diff -u -r1.31 gui.c
--- src/gui.c 24 Oct 2005 10:07:37 -0000 1.31
+++ src/gui.c 21 Jan 2006 10:42:51 -0000
＠＠ -804,15 +804,10 ＠＠
RETURN_UNGCPRO (ret);
}
-static void
-finalize_gui_item (void *UNUSED (header), int UNUSED (for_disksave))
-{
-}
-
DEFINE_LRECORD_IMPLEMENTATION ("gui-item", gui_item,
0, /*dumpable-flag*/
mark_gui_item, print_gui_item,
- finalize_gui_item, gui_item_equal,
+ 0, gui_item_equal,
gui_item_hash,
gui_item_description,
Lisp_Gui_Item);
Index: src/lisp.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lisp.h,v
retrieving revision 1.136
diff -u -r1.136 lisp.h
--- src/lisp.h 26 Nov 2005 11:46:09 -0000 1.136
+++ src/lisp.h 21 Jan 2006 10:42:55 -0000
＠＠ -2637,19 +2637,20 ＠＠
/* WARNING: Everything before ascii_begin must agree exactly with
struct lrecord_header */
unsigned int type :8;
+ unsigned int finalize :1;
#ifdef MC_ALLOC
unsigned int lisp_readonly :1;
unsigned int free :1;
/* Number of chars at beginning of string that are one byte in length
(byte_ascii_p) */
- unsigned int ascii_begin :22;
+ unsigned int ascii_begin :21;
#else /* not MC_ALLOC */
unsigned int mark :1;
unsigned int c_readonly :1;
unsigned int lisp_readonly :1;
/* Number of chars at beginning of string that are one byte in length
(byte_ascii_p) */
- unsigned int ascii_begin :21;
+ unsigned int ascii_begin :20;
#endif /* not MC_ALLOC */
} v;
} u;
＠＠ -3459,6 +3460,7 ＠＠
{ \
{ /* struct lrecord_header */ \
lrecord_type_subr, /* lrecord_type_index */ \
+ 0, /* finalize bit */ \
1, /* lisp_readonly bit */ \
0, /* free */ \
0 /* uid */ \
＠＠ -3481,6 +3483,7 ＠＠
{ \
{ /* struct lrecord_header */ \
lrecord_type_subr, /* lrecord_type_index */ \
+ 0, /* finalize bit */ \
1, /* mark bit */ \
1, /* c_readonly bit */ \
1, /* lisp_readonly bit */ \
＠＠ -4033,7 +4036,8 ＠＠
#endif /* not DEBUG_XEMACS */
#endif /* MC_ALLOC */
-void register_post_gc_action (void (*fun) (void *), void *arg);
+void register_post_gc_action (void (*fun) (void *, int), void *arg);
+void run_post_gc_actions (void);
int begin_gc_forbidden (void);
void end_gc_forbidden (int count);
extern int gc_currently_forbidden;
Index: src/lrecord.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lrecord.h,v
retrieving revision 1.46
diff -u -r1.46 lrecord.h
--- src/lrecord.h 27 Nov 2005 10:51:25 -0000 1.46
+++ src/lrecord.h 21 Jan 2006 10:42:56 -0000
＠＠ -111,6 +111,11 ＠＠
field. */
unsigned int type :8;
+ /* The `finalize' field is a flag that indicates whether this
+ lrecord has to be finalized or not. This allows an asynchronous
+ finalization mechanism. */
+ unsigned int finalize :1;
+
#ifdef MC_ALLOC
/* 1 if the object is readonly from lisp */
unsigned int lisp_readonly :1;
＠＠ -123,7 +128,7 ＠＠
/* The `uid' field is just for debugging/printing convenience. Having
this slot doesn't hurt us spacewise, since the bits are unused
anyway. (The bits are used for strings, though.) */
- unsigned int uid :22;
+ unsigned int uid :21;
#else /* not MC_ALLOC */
/* If `mark' is 0 after the GC mark phase, the object will be freed
＠＠ -143,7 +148,7 ＠＠
/* The `uid' field is just for debugging/printing convenience. Having
this slot doesn't hurt us spacewise, since the bits are unused
anyway. (The bits are used for strings, though.) */
- unsigned int uid :21;
+ unsigned int uid :20;
#endif /* not MC_ALLOC */
};
＠＠ -156,6 +161,7 ＠＠
#define set_lheader_implementation(header,imp) do { \
struct lrecord_header* SLI_header = (header); \
SLI_header->type = (imp)->lrecord_type_index; \
+ SLI_header->finalize = ((imp)->finalizer) ? 1 : 0; \
SLI_header->lisp_readonly = 0; \
SLI_header->free = 0; \
SLI_header->uid = lrecord_uid_counter++; \
＠＠ -164,6 +170,7 ＠＠
#define set_lheader_implementation(header,imp) do { \
struct lrecord_header* SLI_header = (header); \
SLI_header->type = (imp)->lrecord_type_index; \
+ SLI_header->finalize = (imp)->finalizer ? 1 : 0; \
SLI_header->mark = 0; \
SLI_header->c_readonly = 0; \
SLI_header->lisp_readonly = 0; \
＠＠ -453,6 +460,23 ＠＠
#endif /* ALLOC_TYPE_STATS */
/* Tell mc-alloc how to call a finalizer. */
+#define MC_ALLOC_REGISTER_FINALIZER(ptr) \
+{ \
+ Lisp_Object MCACF_obj = wrap_pointer_1 (ptr); \
+ struct lrecord_header *MCACF_lheader = XRECORD_LHEADER (MCACF_obj); \
+ if (XRECORD_LHEADER (MCACF_obj) && LRECORDP (MCACF_obj) \
+ && LRECORD_FINALIZE_P (MCACF_lheader) \
+ && !LRECORD_FREE_P (MCACF_lheader) ) \
+ { \
+ const struct lrecord_implementation *MCACF_implementation \
+ = LHEADER_IMPLEMENTATION (MCACF_lheader); \
+ if (MCACF_implementation && MCACF_implementation->finalizer) \
+ { \
+ register_post_gc_action \
+ (MCACF_implementation->finalizer, (void *) ptr); \
+ } \
+ } \
+} while (0)
#ifdef NEW_GC
#define MC_ALLOC_CALL_FINALIZER(ptr) \
{ \
＠＠ -474,14 +498,17 ＠＠
#define MC_ALLOC_CALL_FINALIZER(ptr) \
{ \
Lisp_Object MCACF_obj = wrap_pointer_1 (ptr); \
- struct lrecord_header *MCACF_lheader = XRECORD_LHEADER (MCACF_obj); \
+ struct lrecord_header *MCACF_lheader = XRECORD_LHEADER (MCACF_obj); \
if (XRECORD_LHEADER (MCACF_obj) && LRECORDP (MCACF_obj) \
+ && LRECORD_FINALIZE_P (MCACF_lheader) \
&& !LRECORD_FREE_P (MCACF_lheader) ) \
{ \
const struct lrecord_implementation *MCACF_implementation \
= LHEADER_IMPLEMENTATION (MCACF_lheader); \
if (MCACF_implementation && MCACF_implementation->finalizer) \
- MCACF_implementation->finalizer (ptr, 0); \
+ { \
+ MCACF_implementation->finalizer (ptr, 0); \
+ } \
} \
} while (0)
#endif /* not NEW_GC */
＠＠ -553,6 +580,15 ＠＠
#endif /* not USE_KKCC */
#define RECORD_DUMPABLE(lheader) (lrecord_implementations_table[(lheader)->type])->dumpable
+
+#define LRECORD_FINALIZE_P(ptr) \
+(((struct lrecord_header *) ptr)->finalize)
+
+#define SET_LRECORD_FINALIZE(ptr) \
+(((struct lrecord_header *) ptr)->finalize = 1)
+
+#define SET_LRECORD_NOT_FINALIZE(ptr) \
+(((struct lrecord_header *) ptr)->finalize = 0)
/* Data description stuff
Index: src/lstream.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lstream.c,v
retrieving revision 1.36
diff -u -r1.36 lstream.c
--- src/lstream.c 25 Oct 2005 08:32:48 -0000 1.36
+++ src/lstream.c 21 Jan 2006 10:42:57 -0000
＠＠ -76,6 +76,7 ＠＠
(at dump time) on objects that are not being released. */
Lstream *lstr = (Lstream *) header;
+ if (!for_disksave && !LRECORD_FINALIZE_P (header)) return;
#if 0 /* this may cause weird Broken Pipes? */
if (for_disksave)
{
＠＠ -97,8 +98,9 ＠＠
if (!for_disksave)
{
- if (lstr->imp->finalizer)
+ if (lstr->imp && lstr->imp->finalizer)
(lstr->imp->finalizer) (lstr);
+ SET_LRECORD_NOT_FINALIZE (header);
}
}
Index: src/marker.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/marker.c,v
retrieving revision 1.18
diff -u -r1.18 marker.c
--- src/marker.c 25 Oct 2005 11:16:26 -0000 1.18
+++ src/marker.c 21 Jan 2006 10:42:57 -0000
＠＠ -111,7 +111,9 ＠＠
if (!for_disksave)
{
Lisp_Object tem = wrap_marker (header);
+ if (!LRECORD_FINALIZE_P (header)) return;
unchain_marker (tem);
+ SET_LRECORD_NOT_FINALIZE (header);
}
}
Index: src/mc-alloc.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/mc-alloc.c,v
retrieving revision 1.6
diff -u -r1.6 mc-alloc.c
--- src/mc-alloc.c 25 Nov 2005 01:42:05 -0000 1.6
+++ src/mc-alloc.c 21 Jan 2006 10:42:58 -0000
＠＠ -1463,6 +1463,7 ＠＠
#ifdef ERROR_CHECK_GC
assert (!LRECORD_FREE_P (ptr));
deadbeef_memory (ptr, PH_CELL_SIZE (ph));
+ SET_LRECORD_NOT_FINALIZE (ptr);
MARK_LRECORD_AS_FREE (ptr);
#endif
}
＠＠ -1530,7 +1531,12 ＠＠
#endif /* not NEW_GC */
{
EMACS_INT ptr = (heap_space + (heap_space_step * mark_bit));
- MC_ALLOC_CALL_FINALIZER ((void *) ptr);
+ MC_ALLOC_REGISTER_FINALIZER ((void *) ptr);
+#ifdef NEW_GC
+ SET_BIT (ph, mark_bit * N_MARK_BITS, BLACK);
+#else /* not NEW_GC */
+ SET_BIT (ph, mark_bit * N_MARK_BITS, 1);
+#endif /* not NEW_GC */
}
}
}
Index: src/objects.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects.c,v
retrieving revision 1.31
diff -u -r1.31 objects.c
--- src/objects.c 26 Nov 2005 11:46:10 -0000 1.31
+++ src/objects.c 21 Jan 2006 10:42:59 -0000
＠＠ -117,11 +117,13 ＠＠
{
Lisp_Color_Instance *c = (Lisp_Color_Instance *) header;
+ if (!for_disksave && !LRECORD_FINALIZE_P (header)) return;
if (!NILP (c->device))
{
if (for_disksave) finalose (c);
MAYBE_DEVMETH (XDEVICE (c->device), finalize_color_instance, (c));
}
+ if (!for_disksave) SET_LRECORD_NOT_FINALIZE (header);
}
static int
＠＠ -333,11 +335,13 ＠＠
{
Lisp_Font_Instance *f = (Lisp_Font_Instance *) header;
+ if (!for_disksave && !LRECORD_FINALIZE_P (header)) return;
if (!NILP (f->device))
{
if (for_disksave) finalose (f);
MAYBE_DEVMETH (XDEVICE (f->device), finalize_font_instance, (f));
}
+ if (!for_disksave) SET_LRECORD_NOT_FINALIZE (header);
}
/* Fonts are equal if they resolve to the same name.
Index: src/process.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/process.c,v
retrieving revision 1.69
diff -u -r1.69 process.c
--- src/process.c 25 Oct 2005 11:16:27 -0000 1.69
+++ src/process.c 21 Jan 2006 10:43:00 -0000
＠＠ -194,6 +194,7 ＠＠
/* #### this probably needs to be tied into the tty event loop */
/* #### when there is one */
Lisp_Process *p = (Lisp_Process *) header;
+ if (!for_disksave && !LRECORD_FINALIZE_P (header)) return;
#ifdef HAVE_WINDOW_SYSTEM
if (!for_disksave)
{
＠＠ -207,6 +208,7 ＠＠
if (!for_disksave)
xfree (p->process_data, void *);
}
+ if (!for_disksave) SET_LRECORD_NOT_FINALIZE (header);
}
DEFINE_LRECORD_IMPLEMENTATION ("process", process,
Index: src/scrollbar-msw.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/scrollbar-msw.c,v
retrieving revision 1.31
diff -u -r1.31 scrollbar-msw.c
--- src/scrollbar-msw.c 25 Oct 2005 08:32:49 -0000 1.31
+++ src/scrollbar-msw.c 21 Jan 2006 10:43:00 -0000
＠＠ -104,7 +104,7 ＠＠
}
static void
-unshow_that_mofo (void *handle)
+unshow_that_mofo (void *handle, int UNUSED (for_disksave))
{
ShowScrollBar ((HWND) handle, SB_CTL, 0);
}
Index: src/specifier.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/specifier.c,v
retrieving revision 1.43
diff -u -r1.43 specifier.c
--- src/specifier.c 25 Nov 2005 01:42:06 -0000 1.43
+++ src/specifier.c 21 Jan 2006 10:43:02 -0000
＠＠ -299,16 +299,16 ＠＠
finalize_specifier (void *header, int for_disksave)
{
Lisp_Specifier *sp = (Lisp_Specifier *) header;
+ if (!for_disksave && !LRECORD_FINALIZE_P (header)) return;
/* don't be snafued by the disksave finalization. */
if (!for_disksave && !GHOST_SPECIFIER_P(sp) && sp->caching)
{
-#ifdef NEW_GC
- mc_free (sp->caching);
-#else /* not NEW_GC */
+#ifndef NEW_GC
xfree (sp->caching, struct specifier_caching *);
#endif /* not NEW_GC */
sp->caching = 0;
}
+ if (!for_disksave) SET_LRECORD_NOT_FINALIZE (header);
}
static int
Index: src/symbols.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/symbols.c,v
retrieving revision 1.54
diff -u -r1.54 symbols.c
--- src/symbols.c 25 Oct 2005 08:32:49 -0000 1.54
+++ src/symbols.c 21 Jan 2006 10:43:04 -0000
＠＠ -3259,6 +3259,7 ＠＠
{ /* struct old_lcrecord_header */
{ /* struct lrecord_header */
lrecord_type_symbol_value_forward, /* lrecord_type_index */
+ 0, /* finalize bit */
1, /* mark bit */
1, /* c_readonly bit */
1, /* lisp_readonly bit */
Index: src/symeval.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/symeval.h,v
retrieving revision 1.16
diff -u -r1.16 symeval.h
--- src/symeval.h 25 Oct 2005 08:32:49 -0000 1.16
+++ src/symeval.h 21 Jan 2006 10:43:05 -0000
＠＠ -423,6 +423,7 ＠＠
{ /* struct old_lcrecord_header */ \
{ /* struct lrecord_header */ \
lrecord_type_symbol_value_forward, /* lrecord_type_index */ \
+ 0, /* finalize bit */ \
1, /* mark bit */ \
1, /* c_readonly bit */ \
1, /* lisp_readonly bit */ \
Index: src/window.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/window.c,v
retrieving revision 1.90
diff -u -r1.90 window.c
--- src/window.c 25 Nov 2005 01:42:08 -0000 1.90
+++ src/window.c 21 Jan 2006 10:43:08 -0000
＠＠ -326,10 +326,12 ＠＠
}
static void
-finalize_window (void *header, int UNUSED (for_disksave))
+finalize_window (void *header, int for_disksave)
{
struct window *w = (struct window *) header;
+ if (!for_disksave && !LRECORD_FINALIZE_P (header)) return;
+
if (w->line_start_cache)
{
Dynarr_free (w->line_start_cache);
＠＠ -358,6 +360,8 ＠＠
Dynarr_free (w->glyph_cachels);
w->glyph_cachels = 0;
}
+
+ if (!for_disksave) SET_LRECORD_NOT_FINALIZE (header);
}
/* These caches map buffers to markers. They are key-weak so that entries
Index: src/xft-fonts.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/xft-fonts.c,v
retrieving revision 1.3
diff -u -r1.3 xft-fonts.c
--- src/xft-fonts.c 26 Nov 2005 18:25:03 -0000 1.3
+++ src/xft-fonts.c 21 Jan 2006 10:43:08 -0000
＠＠ -88,14 +88,16 ＠＠
****************************************************************/
static void
-finalize_fc_pattern (void *header, int UNUSED (for_disksave))
+finalize_fc_pattern (void *header, int for_disksave)
{
struct fc_pattern *p = (struct fc_pattern *) header;
+ if (!for_disksave && !LRECORD_FINALIZE_P (header)) return;
if (p->fcpatPtr)
{
FcPatternDestroy (p->fcpatPtr);
p->fcpatPtr = 0;
}
+ if (!for_disksave) SET_LRECORD_NOT_FINALIZE (header);
}
static const struct memory_description fcpattern_description [] = {
--
Marcus
- 1 participants
- 1 comments
[PATCH] [RECOMMEND 21.4] Stopping timeouts during GC causes lossage on all GUI platforms (X11, GTK and Win32)
18 years, 10 months
Daniel Pittman
Daniel Pittman
G'day.
I was experiencing a semi-regular failure of an error checking XEmacs
while reading items with Gnus that I tracked down to being caused by
animated images.
To rotate the animation, XEmacs registers a timeout for them and, in the
image finalize method, cancels the timeout.
Unfortunately, the method that cancels the timeout will synchronously
free a wide range of Lisp objects, which causes heartburn for the GC
system -- an assert and, presumably, the risk of a genuine crash without
it.
This crash is common to all platforms, as they all use the same common
code to actually cancel the image timeout.
The solution I have implemented in this patch is to modify the common
method. Now, rather than immediately cancel the timeout, that common
code will register a suitable post-GC action to cancel the timeout once
we are safely outside the danger zone.
This keeps the change to a single file, and avoids needing to embed more
tricky timing logic into the three GUI branches that would then need to
be kept in sync.
This is recommended for 21.5 as well as HEAD because the same problem is
present on both sides.
Regards,
Daniel
- 2 participants
- 2 comments
[PATCH 21.4] Xpm no-X builds fail on current cygwin
18 years, 10 months
Vin Shelton
Vin Shelton
Recently (I assume due to the 1.5.19 release of cygwin), the output of
'gcc -print-file-name=libc.a' changed from
/usr/lib/gcc/i686-pc-cygwin/3.4.4/../../../lib.a
to
/bin/../lib/gcc/i686-pc-cygwin/3.4.4/../../../libc.a
changing the effective path from /usr/lib to /lib. This change means
that the somewhat hokey way we were finding the noX version of the XPM
include files (and lib) no longer works, yielding compilation errors
in scrollbar-msw.c:
gcc -c -I/bin/../lib/gcc/i686-pc-cygwin/3.4.4/../../../../include/noX -g -O3 -Wall -Wno-switch -Winline -Wmissing-prototypes -Wsign-compare -fno-strict-aliasing -Wshadow -Wpointer-arith -Demacs -I. -DHAVE_CONFIG_H -Wno-sign-compare -fno-caller-saves scrollbar-msw.c
In file included from console-msw.h:40,
from scrollbar-msw.c:29:
/usr/include/X11/xpm.h:71:63: simx.h: No such file or directory
The attached patch works for me. Volker, please review. I will
probably apply this to the 21.4 branch before 21.4.19 is released.
A similar patch is needed for 21.5.
- Vin
ChangeLog addition:
2006-01-23 Vin Shelton <acs(a)xemacs.org>
* configure.in: Simplify cygwin include and nox/Xpm handling.
As of cygwin-1.5.19, 'gcc -print-file-name=libc.a' (effectively)
returns '/lib' instead of '/usr/lib', so we'll use
'gcc -print-search-dirs' instead.
21.4 source patch:
Diff command: cvs -q diff -u
Files affected: configure.in
Index: configure.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.in,v
retrieving revision 1.151.2.36
diff -a -u -u -r1.151.2.36 configure.in
--- configure.in 2005/12/24 00:48:14 1.151.2.36
+++ configure.in 2006/01/24 02:59:15
＠＠ -1895,9 +1895,9 ＠＠
dnl XEmacs supported mingw and cygnus have made this incompatible change
dnl so we just go with the flow.
case "$opsys" in mingw* | cygwin*)
- cygwin_include=`eval "gcc -print-file-name=libc.a"` ;
- cygwin_include=`eval "dirname $cygwin_include"` ;
- cygwin_include="-I$cygwin_include/../include" ;
+ cygwin_include=`eval gcc -print-search-dirs | sed -ne s'/install: //p'`
+ cygwin_include=`eval "cd $cygwin_include/../../../..; pwd"`
+ cygwin_include="-I$cygwin_include/include" ;
extra_includes="$cygwin_include/mingw $cygwin_include" ;
case "$opsys" in mingw*)
XE_APPEND($extra_includes, c_switch_system) ;;
＠＠ -3361,9 +3361,8 ＠＠
incpath_xpm=
case "$opsys" in
cygwin*)
- cygwin_top=`eval "gcc -print-file-name=libc.a"` ;
- cygwin_top=`eval "dirname ${cygwin_top}"`;
- cygwin_top="${cygwin_top}/..";
+ cygwin_top=`eval gcc -print-search-dirs | sed -ne s'/install: //p'`
+ cygwin_top=`eval "cd $cygwin_top/../../../..; pwd"`
case "$window_system" in
dnl use "standard" search pattern
x11) ;;
- 4 participants
- 5 comments
[AC21.4] Update InnoSetup script
18 years, 10 months
Vin Shelton
Vin Shelton
21.4 source patch:
Diff command: cvs -q diff -u
Files affected: nt/XEmacs.iss
Index: nt/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/ChangeLog,v
retrieving revision 1.89.2.42
diff -a -u -u -r1.89.2.42 ChangeLog
--- nt/ChangeLog 2006/01/29 00:00:33 1.89.2.42
+++ nt/ChangeLog 2006/01/31 22:58:07
＠＠ -1,5 +1,9 ＠＠
2006-01-28 Vin Shelton <acs(a)xemacs.org>
+ * XEmacs.iss: Erase old code.
+
+2006-01-28 Vin Shelton <acs(a)xemacs.org>
+
* XEmacs 21.4.19 is released
2006-01-28 Vin Shelton <acs(a)xemacs.org>
Index: nt/XEmacs.iss
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/Attic/XEmacs.iss,v
retrieving revision 1.1.2.5
diff -a -u -u -r1.1.2.5 XEmacs.iss
--- nt/XEmacs.iss 2006/01/28 22:55:47 1.1.2.5
+++ nt/XEmacs.iss 2006/01/31 22:58:07
＠＠ -2,6 +2,7 ＠＠
; This script runs with Inno Setup version 5.1.6, see http://www.jrsoftware.org/ for more info.
;
; Version History
+; 2006-01-28 Vin Shelton <acs(a)xemacs.org> Erase unused registry code.
; 2006-01-26 Vin Shelton <acs(a)xemacs.org> Don't append XEmacs binary directory to system path.
; 2006-01-21 Vin Shelton <acs(a)xemacs.org> Append XEmacs binary directory to system path; this is not currently deleted on uninstall.
; Get built kit from C:\XEmacs-built.
＠＠ -49,14 +50,6 ＠＠
Name: "{userdesktop}\XEmacs"; Filename: "{app}\XEmacs-{code:XEmacsVersion}\i586-pc-win32\xemacs.exe"; Tasks: desktopicon
Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\XEmacs"; Filename: "{app}\XEmacs-{code:XEmacsVersion}\i586-pc-win32\xemacs.exe"; Tasks: quicklaunchicon
-[Registry]
-; Set a registry key to point to the packages so they can be shared between multiple installed versions of XEmacs
-; This is no longer necessary as of version 21.4.19.
-;Root: HKLM; Subkey: "Software\XEmacs\XEmacs"; ValueType: string; ValueName: "EMACSPACKAGEPATH"; ValueData: "{app}\Packages"; Flags: uninsdeletekey
-; Don't fiddle with the system path
-;Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; ValueType: expandsz; ValueName: "Path"; ValueData: "{olddata};{app}\XEmacs-{code:XEmacsVersion}\i586-pc-win32"
-
-
[Run]
Filename: "{app}\XEmacs-{code:XEmacsVersion}\i586-pc-win32\xemacs.exe"; Description: "{cm:LaunchProgram,XEmacs}"; Flags: nowait postinstall skipifsilent
＠＠ -71,7 +64,7 ＠＠
procedure CurStepChanged(CurStep: TSetupStep);
var
- BinDir: String;
+// BinDir: String;
EtcDir: String;
InstallBase: String;
SiteStart: String;
- 1 participants
- 0 comments
novità
18 years, 10 months
info＠compagnidiviaggi.com
info＠compagnidiviaggi.com
Gentile amico,
volevamo informarti che è online il sito http://www.compagnidiviaggi.com
Il sito completamente gratuito dove potrai trovare amici e compagni per i tuoi viaggi.
Ciao e a presto
=========================================
Compagni di Viaggi
E-Mail: info(a)compagnidiviaggi.com
sito: http://www.compagnidiviaggi.com
- 1 participants
- 0 comments
[C] xemacsweb: Update Download/win32 from removed InnoSetup kit 21.4.18-1.exe to 21.4.19.exe
18 years, 10 months
Adrian Aichner
Adrian Aichner
COMMIT
This is the manual part of the update.
Included file
Download/win32/innosetup-win32.txt
was updated from
revision 1.6
of xemacs-builds/adrian/website/package-get-2-download-sites.el
by use of
M-x package-get-2-download-sites
I realize this update may be premature, but it was forced by all the
broken links caused by the removal of 21.4.18-1.exe.
See the
/Download/win32/
[file: /Download/win32/index.html]
had 25 failed urls
bit in
http://www.dk.xemacs.org/linklint/urlfailF.html
before the next 03:00 CET update.
Adrian
xemacsweb ChangeLog patch:
Diff command: cvs -q diff -U 0
Files affected: Download/win32/ChangeLog
Index: Download/win32/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Download/win32/ChangeLog,v
retrieving revision 1.47
diff -u -U0 -r1.47 ChangeLog
--- Download/win32/ChangeLog 6 Jan 2006 11:56:12 -0000 1.47
+++ Download/win32/ChangeLog 30 Jan 2006 21:51:34 -0000
＠＠ -0,0 +1,5 ＠＠
+2006-01-30 Adrian Aichner <adrian(a)xemacs.org>
+
+ * index.content: Update from removed InnoSetup kit 21.4.18-1.exe
+ to 21.4.19.exe.
+
xemacsweb source patch:
Diff command: cvs -f -z3 -q diff -u -w -N
Files affected: Download/win32/index.content
Index: Download/win32/index.content
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Download/win32/index.content,v
retrieving revision 1.40
diff -u -w -r1.40 index.content
--- Download/win32/index.content 1 Jan 2006 16:19:41 -0000 1.40
+++ Download/win32/index.content 30 Jan 2006 21:43:51 -0000
＠＠ -26,7 +26,7 ＠＠
<dl>
<!-- one of (dd dt) -->
- <dt>XEmacs 21.4.18 "Social Property"</dt>
+ <dt>XEmacs 21.4.19 "Constant Variable"</dt>
<dd>
<p>
This native Windows setup kit includes a small set of
--
Adrian Aichner
mailto:adrian＠xemacs.org
http://www.xemacs.org/
- 1 participants
- 0 comments