December 2004 - XEmacs-Patches - XEmacs Mailing List Archives

[PATCH] Update man page for init file, one nroff format error 17 years, 2 months

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

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(&lt); + 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

patch: DESTDIR support for XEmacs 21.5.18 19 years, 9 months

Mike FABIAN

A patch to add DESTDIR support to the Makefiles of XEmacs 21.5.18 is attached. This should make it a bit easier for distributors to build XEmacs packages. I had already submitted such a patch in February 2004, but Steve Youngs pointed out some problems. As I was busy with other things I had no time to improve this patch until now. 2004-12-31 Mike FABIAN <mfabian(a)suse.de> * Makefile.in.in: * dynodump/Makefile.in.in: * etc/tests/external-widget/Makefile: * lib-src/Makefile.in.in: * lwlib/Makefile.in.in: * man/Makefile: * modules/base64/Makefile: * modules/common/Makefile.common: * modules/zlib/Makefile: * netinstall/Makefile.in.in: * src/Makefile.in.in: * tests/tooltalk/Makefile: Add DESTDIR support. -- Mike FABIAN <mfabian(a)suse.de> http://www.suse.de/~mfabian 睡眠不足はいい仕事の敵だ。

3 participants
5 comments

[21.4,21.5] Metacity maximize bug localized 19 years, 11 months

Stephen J. Turnbull

Vin, please note: For me this applies to 21.4 with offset -3, but is NOT RECOMMENDED yet. There have been persistent reports of inflooping with window managers that don't respect XEmacs's desire to size to a exact number of character cells, specifically when maximizing the XEmacs frame. The surface problem is that XEmacs doesn't take XtGeometryNo for an answer. The attached patch fixes that, and my XEmacs is now well-behaved under metacity. However, the underlying problem is that the EmacsManager shell widget's geometry management system contains mutually recursive functions, and furthermore actually changes the geometry of children in the process of a query. Really straightening this out (at minimum, the structure of the geometry manager must be documented) isn't going to be easy (unless there's somebody more expert than I willing to work on it). Proposal: Apply this patch to 21.5 and work out any new geometry management issues as they come up, then get something into 21.4 quickly. Comments? Index: src/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.761 diff -u -U0 -r1.761 ChangeLog --- src/ChangeLog 7 Dec 2004 12:52:48 -0000 1.761 +++ src/ChangeLog 15 Dec 2004 03:57:02 -0000 ＠＠ -0,0 +1,4 ＠＠ +2004-12-15 Stephen J. Turnbull <stephen(a)xemacs.org> + + * EmacsManager.c (EmacsManagerChangeSize): Respect XtGeometryNo. + Index: src/EmacsManager.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/EmacsManager.c,v retrieving revision 1.6 diff -u -r1.6 EmacsManager.c --- src/EmacsManager.c 20 Sep 2004 19:19:34 -0000 1.6 +++ src/EmacsManager.c 15 Dec 2004 03:57:09 -0000 ＠＠ -243,11 +243,15 ＠＠ /* do nothing if we're already that size */ if (w->core.width != width || w->core.height != height) - if (XtMakeResizeRequest (w, width, height, &w->core.width, &w->core.height) - == XtGeometryAlmost) - XtMakeResizeRequest (w, w->core.width, w->core.height, NULL, NULL); - - Resize (w); + { + XtGeometryResult result = + XtMakeResizeRequest (w, width, height, &w->core.width, &w->core.height); + if (result == XtGeometryNo) + return; + if (result == XtGeometryAlmost) + XtMakeResizeRequest (w, w->core.width, w->core.height, NULL, NULL); + Resize (w); + } } -- Institute of Policy and Planning Sciences http://turnbull.sk.tsukuba.ac.jp University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN Ask not how you can "do" free software business; ask what your business can "do for" free software.

3 participants
3 comments

[21.5R21.4] Add 3rd arg to make-obsolete(-variable) 19 years, 11 months

Ville Skyttä

21.5 RECOMMEND 21.4 This patch syncs the API of make-obsolete(-variable) with GNU Emacs. The result is one annoyance less later when syncing other stuff. Will commit soon unless there are objections. Applies also to 21.4, with a 1-line offset in lisp/bytecomp-runtime.el.

2 participants
2 comments

[COMMIT] "Son of a bitch." 19 years, 11 months

Ben Wing

NOTE: This patch has been committed. That's what you say when you discover a bug like this. Definitely goes in 21.4. lisp/ChangeLog addition: 2004-12-11 Ben Wing <ben(a)xemacs.org> * files.el (find-coding-system-magic-cookie-in-file): File positions are 0 based not 1 based. build source patch: Diff command: bash -ci "cvs-diff --show-c-function -no-changelog " Files affected: lisp/files.el Index: lisp/files.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/files.el,v retrieving revision 1.70 diff -u -p -r1.70 files.el --- lisp/files.el 2004/06/06 23:58:44 1.70 +++ lisp/files.el 2004/12/12 02:44:25 ＠＠ -2107,7 +2107,7 ＠＠ ISO 2022 encoding of most non-ASCII char (save-excursion (with-temp-buffer (let ((coding-system-for-read 'raw-text)) - (insert-file-contents file nil 1 3001)) + (insert-file-contents file nil 0 3000)) (goto-char (point-min)) (or (and (looking-at "^[^\n]*-\\*-[^\n]*coding: \$[^ \t\n;]+\$[^\n]*-\\*-")

2 participants
1 comments

Re: We need to get rid of configure.ac stub 19 years, 12 months

Andreas Schwab

Mike FABIAN <mfabian(a)suse.de> writes: > "Ben Wing" <ben(a)666.com> さんは書きました: > >> Mike -- this patch looks good, but I notice you have deleted some of the >> code to generate both Makefile and GNUMakefile; now it appears that the >> plain Makefile is generated with -DUSE_GNU_MAKE. Could you fix this? > > I didn't write that patch, I think Andreas Schwab did. I didn't. Werner wrote the orignal patch, but you modified it while updating to 21.4.4 (back in 2001). Andreas. -- Andreas Schwab, SuSE Labs, schwab(a)suse.de SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."

1 participants
0 comments

patch: update for dinbrief.el 19 years, 12 months

Mike FABIAN

Here is a patch by Werner Fink <werner(a)suse.de> to update dinbrief.el. Werner is the original author of dinbrief.el (He is in the CC). -- Mike FABIAN <mfabian(a)suse.de> http://www.suse.de/~mfabian 睡眠不足はいい仕事の敵だ。

1 participants
0 comments

Re: We need to get rid of configure.ac stub 19 years, 12 months

Mike FABIAN

"Stephen J. Turnbull" <stephen(a)xemacs.org> さんは書きました: >>>>>> "SY" == Steve Youngs <steve(a)youngs.au.com> writes: > > SY> My autoconf doesn't do this, and I haven't heard of anyone > SY> else's autoconf doing it either. > > Debian's has done this since about ac 2.53. I believe SuSE and Red > Hat both do, as well. > > SY> And, just out of curiosity, what does this cygwin autoconf > SY> wrapper do when faced with a configure.in that is for autoconf > SY> 2.5x only? I've come across plenty of those. > > The Debian wrapper will puke, in a rather uninformative way if there's > no AC_REQUIRE. > > Ben, please don't remove it. The right thing to do is to update > XEmacs's configure.in to 2.5x compatibility. There's a patch in the > queue from SuSE, has been for a long time (I've been hoping Didier > would resurrect himself and review it ...). recently I have updated the xemacs packages for the next SuSE Linux distribution to XEmacs 21.5.18. I'll attach our current autoconf patch which is against XEmacs 21.5.18 in the hope that it is helpful. I believe most of this patch is originally by Andreas Schwab <schwab(a)suse.de> (added to CC:). -- Mike FABIAN <mfabian(a)suse.de> http://www.suse.de/~mfabian 睡眠不足はいい仕事の敵だ。

2 participants
2 comments

[web] broken variable name in Local.rules.template? 19 years, 12 months

Stephen J. Turnbull

web Adrian, please check. LINKLINT_IGNORESET was spelled LINKLINT_INGORESET, which looks like a typo. I probably won't be able to commit for a couple days, but if you want me to do it, let me know. Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacsweb/ChangeLog,v retrieving revision 1.220 diff -u -U0 -r1.220 ChangeLog --- ChangeLog 18 Dec 2004 01:02:24 -0000 1.220 +++ ChangeLog 30 Dec 2004 08:47:44 -0000 ＠＠ -0,0 +1,4 ＠＠ +2004-12-30 Stephen J. Turnbull <stephen(a)xemacs.org> + + * Local.rules.template (LINKLINT_IGNORESET): Fix typo. + Index: Local.rules.template =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Local.rules.template,v retrieving revision 1.4 diff -u -r1.4 Local.rules.template --- Local.rules.template 5 Dec 2004 10:21:44 -0000 1.4 +++ Local.rules.template 30 Dec 2004 08:47:54 -0000 ＠＠ -20,7 +20,7 ＠＠ # LINKLINT_CASE=-case # APA: Ignore checking of links into the XEmacs CVS repository via ViewCVS. # These checks are expensive and links are correct by design. -LINKLINT_INGORESET=-ignore http://cvs.xemacs.org/viewcvs.cgi/XEmacs/＠ +LINKLINT_IGNORESET=-ignore http://cvs.xemacs.org/viewcvs.cgi/XEmacs/＠ GENPAGE_CONF="genpage.conf" -- Institute of Policy and Planning Sciences http://turnbull.sk.tsukuba.ac.jp University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN Ask not how you can "do" free software business; ask what your business can "do for" free software.

1 participants
0 comments

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

XEmacs-Patches December 2004