October 2005 - XEmacs-Patches - XEmacs Mailing List Archives

[PATCH] Update man page for init file, one nroff format error 17 years, 3 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, 3 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] xemacs-21.5-clean: Another package-get.el update reflecting latest http://www.xemacs.org/Releases/ information 19 years, 1 month

Adrian Aichner

xemacs-21.5-clean ChangeLog patch: Diff command: cvs -q diff -U 0 Files affected: lisp/ChangeLog Index: lisp/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v retrieving revision 1.689 diff -u -U0 -r1.689 ChangeLog --- lisp/ChangeLog 25 Oct 2005 11:28:23 -0000 1.689 +++ lisp/ChangeLog 27 Oct 2005 23:24:15 -0000 ＠＠ -0,0 +1,7 ＠＠ +2005-10-28 Adrian Aichner <adrian(a)xemacs.org> + + * package-get.el (package-get-download-sites): Update reflecting + latest http://www.xemacs.org/Releases/ information generated by + xemacs-builds/adrian/website/package-get-2-download-sites.el. + * package-get.el (package-get-pre-release-download-sites): Ditto. + xemacs-21.5-clean source patch: Diff command: cvs -f -z3 -q diff -u -w -N Files affected: lisp/package-get.el Index: lisp/package-get.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/package-get.el,v retrieving revision 1.71 diff -u -w -r1.71 package-get.el --- lisp/package-get.el 24 Oct 2005 22:40:21 -0000 1.71 +++ lisp/package-get.el 27 Oct 2005 23:22:36 -0000 ＠＠ -227,15 +227,15 ＠＠ ("Japan (aist.go.jp)" "ring.aist.go.jp" "pub/text/xemacs/packages") ("Japan (asahi-net.or.jp)" "ring.asahi-net.or.jp" "pub/text/xemacs/packages") ("Japan (dti.ad.jp)" "ftp.dti.ad.jp" "pub/unix/editor/xemacs/packages") - ("Japan (jaist.ac.jp)" "ftp.jaist.ac.jp" "pub/GNU/xemacs/packages") - ("Japan (jp.xemacs.org)" "ftp.jp.xemacs.org" "pub/GNU/xemacs/packages") +; ("Japan (jaist.ac.jp)" "ftp.jaist.ac.jp" "pub/GNU/xemacs/packages") +; ("Japan (jp.xemacs.org)" "ftp.jp.xemacs.org" "pub/GNU/xemacs/packages") ; ("Japan (nucba.ac.jp)" "mirror.nucba.ac.jp" "mirror/xemacs/packages") ("Japan (sut.ac.jp)" "sunsite.sut.ac.jp" "pub/archives/packages/xemacs/packages") ("Korea (kr.xemacs.org)" "ftp.kr.xemacs.org" "pub/tools/emacs/xemacs/packages") ("New Zealand (nz.xemacs.org)" "ftp.nz.xemacs.org" "mirror/ftp.xemacs.org/packages") ("Norway (no.xemacs.org)" "ftp.no.xemacs.org" "pub/xemacs/packages") ("Poland (pl.xemacs.org)" "ftp.pl.xemacs.org" "pub/unix/editors/xemacs/packages") - ("Russia (ru.xemacs.org)" "ftp.ru.xemacs.org" "pub/xemacs/packages") + ("Russia (ru.xemacs.org)" "ftp.ru.xemacs.org" "pub/emacs/xemacs/packages") ; ("South Africa (za.xemacs.org)" "ftp.za.xemacs.org" "mirrorsites/ftp.xemacs.org/packages") ("Sweden (se.xemacs.org)" "ftp.se.xemacs.org" "pub/gnu/xemacs/packages") ("Switzerland (ch.xemacs.org)" "ftp.ch.xemacs.org" "mirror/xemacs/packages") ＠＠ -245,7 +245,8 ＠＠ ("US (stealth.net)" "ftp.stealth.net" "pub/mirrors/ftp.xemacs.org/pub/xemacs/packages") ("US (unc.edu)" "metalab.unc.edu" "pub/packages/editors/xemacs/packages") ("US (us.xemacs.org)" "ftp.us.xemacs.org" "pub/xemacs/packages") - ("US (utk.edu)" "ftp.sunsite.utk.edu" "pub/xemacs/packages")) +; ("US (utk.edu)" "ftp.sunsite.utk.edu" "pub/xemacs/packages") + ) "*List of remote sites available for downloading packages. List format is '(site-description site-name directory-on-site). SITE-DESCRIPTION is a textual description of the site. SITE-NAME ＠＠ -261,7 +262,7 ＠＠ (defcustom package-get-pre-release-download-sites '( ;; Main XEmacs Site (ftp.xemacs.org) - ("Pre-Releases (Main XEmacs Site)" "ftp.xemacs.org" + ("US Pre-Releases (Main XEmacs Site)" "ftp.xemacs.org" "pub/xemacs/beta/experimental/packages") ;; In alphabetical order of Country, our mirrors... ("Argentina Pre-Releases (xmundo.net)" "xemacs.xmundo.net" ＠＠ -310,10 +311,10 ＠＠ "pub/text/xemacs/beta/experimental/packages") ("Japan Pre-Releases (dti.ad.jp)" "ftp.dti.ad.jp" "pub/unix/editor/xemacs/beta/experimental/packages") - ("Japan Pre-Releases (jaist.ac.jp)" "ftp.jaist.ac.jp" - "pub/GNU/xemacs/beta/experimental/packages") - ("Japan Pre-Releases (jp.xemacs.org)" "ftp.jp.xemacs.org" - "pub/GNU/xemacs/beta/experimental/packages") +; ("Japan Pre-Releases (jaist.ac.jp)" "ftp.jaist.ac.jp" +; "pub/GNU/xemacs/beta/experimental/packages") +; ("Japan Pre-Releases (jp.xemacs.org)" "ftp.jp.xemacs.org" +; "pub/GNU/xemacs/beta/experimental/packages") ("Japan Pre-Releases (sut.ac.jp)" "sunsite.sut.ac.jp" "pub/archives/packages/xemacs/xemacs-21.5/experimental/packages") ("Korea (kr.xemacs.org)" "ftp.kr.xemacs.org" ＠＠ -325,7 +326,7 ＠＠ ("Poland Pre-Releases (pl.xemacs.org)" "ftp.pl.xemacs.org" "pub/unix/editors/xemacs/beta/experimental/packages") ("Russia Pre-Releases (ru.xemacs.org)" "ftp.ru.xemacs.org" - "pub/xemacs/beta/experimental/packages") + "pub/emacs/xemacs/beta/experimental/packages") ; ("South Africa Pre-Releases (za.xemacs.org)" "ftp.za.xemacs.org" ; "mirrorsites/ftp.xemacs.org/beta/experimental/packages") ("Sweden Pre-Releases (se.xemacs.org)" "ftp.se.xemacs.org" ＠＠ -344,8 +345,9 ＠＠ "pub/packages/editors/xemacs/beta/experimental/packages") ("US Pre-Releases (us.xemacs.org)" "ftp.us.xemacs.org" "pub/xemacs/beta/experimental/packages") - ("US Pre-Releases (utk.edu)" "ftp.sunsite.utk.edu" - "pub/xemacs/beta/experimental/packages")) +; ("US Pre-Releases (utk.edu)" "ftp.sunsite.utk.edu" +; "pub/xemacs/beta/experimental/packages") +) "*List of remote sites available for downloading \"Pre-Release\" packages. List format is '(site-description site-name directory-on-site). SITE-DESCRIPTION is a textual description of the site. SITE-NAME -- Adrian Aichner mailto:adrian＠xemacs.org http://www.xemacs.org/

2 participants
5 comments

[21.5R21.4] Sync packages mirrors list with website 19 years, 1 month

Ville Skyttä

21.5 RECOMMEND 21.4 On Tue, 2005-10-18 at 09:02 +0200, Adrian Aichner wrote: > Ville Skyttä <scop(a)xemacs.org> writes: > > > Hmm, I see lisp/package-get.el needs an update too... > g> > > You're right, Ville! > > And both 21.5 and 21.4 should be updated. Here's a cursory untested sync, applies to both 21.4 and 21.5. I could not verify xemacs.xmundo.net, but added it anyway. 2005-10-18 Ville Skyttä <scop(a)xemacs.org> * package-get.el (package-get-download-sites): Sync mirrors list with the XEmacs website. (package-get-pre-release-download-sites): Ditto.

2 participants
1 comments

[AC21.5R21.4] [CORE (21.5)] fix build for FreeBSD ia64 and other 64bit platforms. 19 years, 1 month

Steve Youngs

APPROVE COMMIT 21.5 RECOMMEND 21.4 The original patch submission looks like it fell through the cracks in the floor. :-( It's here... http://list-archive.xemacs.org/xemacs-patches/200507/msg00052.html Thanks very much, Dejan, and Andrey. This is now in XEmacs 21.5 CVS. Vin, this is also needed in 21.4 NOTE: This patch has been committed. 21.5 patch: ChangeLog files diff command: cvs -q diff -U 0 Files affected: src/ChangeLog Source files diff command: cvs -q diff -uN Files affected: src/unexelf.c Index: src/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.866 diff -u -p -U0 -r1.866 ChangeLog --- src/ChangeLog 4 Oct 2005 17:51:22 -0000 1.866 +++ src/ChangeLog 10 Oct 2005 03:00:36 -0000 ＠＠ -0,0 +1,6 ＠＠ +2005-10-10 Andrey Slusar <anrays(a)gmail.com> + + * unexelf.c: define `Elfw(type)' for FreeBSD alpha and all _LP64 + archs. + From Dejan Lesjak <dejan.lesjak(a)ijs.si> + Index: src/unexelf.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/unexelf.c,v retrieving revision 1.18 diff -u -p -u -r1.18 unexelf.c --- src/unexelf.c 4 Jul 2005 13:11:27 -0000 1.18 +++ src/unexelf.c 10 Oct 2005 02:59:33 -0000 ＠＠ -478,7 +478,7 ＠＠ typedef struct { # include <sys/exec_elf.h> #endif -#if defined(__FreeBSD__) && (defined(__alpha__) || defined(__amd64__)) +#if defined(__FreeBSD__) && (defined(__alpha__) || defined(_LP64)) # ifdef __STDC__ # define ElfW(type) Elf64_##type # else -- |---<Steve Youngs>---------------<GnuPG KeyID: A94B3003>---| | I am Dyslexic of Borg. | | Fusistance is retile. Your arse will be laminated. | |------------------------------------<steve(a)sxemacs.org>---|

2 participants
1 comments

[AC21.5R21.4] [CORE (21.5)] Fix C-h n -- Don't find package NEWS files 19 years, 1 month

Steve Youngs

APPROVE COMMIT 21.5 RECOMMEND 21.4 As reported by Hrvoje on -beta. Vin, this is needed in 21.4 as well. NOTE: This patch has been committed. 21.5 patch: ChangeLog files diff command: cvs -q diff -U 0 Files affected: lisp/ChangeLog Source files diff command: cvs -q diff -uN Files affected: lisp/help.el Index: lisp/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v retrieving revision 1.680 diff -u -p -U0 -r1.680 ChangeLog --- lisp/ChangeLog 9 Oct 2005 10:41:37 -0000 1.680 +++ lisp/ChangeLog 10 Oct 2005 02:44:13 -0000 ＠＠ -0,0 +1,6 ＠＠ +2005-10-10 Steve Youngs <steve(a)sxemacs.org> + + * help.el (view-emacs-news): Use `expand-file-name' instead of + `locate-data-file' as the latter will find any "NEWS" files that + might exist in packages _before_ the one in core. + Index: lisp/help.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/help.el,v retrieving revision 1.44 diff -u -p -u -r1.44 help.el --- lisp/help.el 31 Jan 2005 20:08:45 -0000 1.44 +++ lisp/help.el 10 Oct 2005 02:43:17 -0000 ＠＠ -838,7 +838,7 ＠＠ of the key sequence that ran this comman (defun view-emacs-news () "Display info on recent changes to XEmacs." (interactive) - (Help-find-file (locate-data-file "NEWS"))) + (Help-find-file (expand-file-name "NEWS" data-directory))) (defun xemacs-www-page () "Go to the XEmacs World Wide Web page." -- |---<Steve Youngs>---------------<GnuPG KeyID: A94B3003>---| | I am Dyslexic of Borg. | | Fusistance is retile. Your arse will be laminated. | |------------------------------------<steve(a)sxemacs.org>---|

2 participants
1 comments

[A21.5R21.4] [C] xemacs-21.5-clean: finder-find-library to return filename actually searched for 19 years, 1 month

Adrian Aichner

COMMIT APPROVE 21.5 RECOMMEND 21.4 There are already two other diffs in the file that should probably be synced back to 21.4. Reported by ...

2 participants
1 comments

[R21.4] revert derived-mode-merge-syntax-tables patch 19 years, 1 month

Stephen J. Turnbull

RECOMMEND 21.4 The original patch apparently slipped into 21.4 inadvertantly (see <87r7hobebk.fsf(a)tleepslib.sk.tsukuba.ac.jp> on XEmacs Beta). This reverts. Note that Jerry's test in <pslluyhzan.fsf(a)diannao.ittc.ku.edu> http://list-archive.xemacs.org/xemacs-beta/200307/msg00153.html is 99% incorrect; `push' will always return non-nil, causing `map-char-table' to exit after one iteration. It should be (let ((keyval nil)) (map-char-table #'(lambda (key value) (push (list key value) keyval) ;; force null return nil) (make-syntax-table)) keyval) Jerry's version still shows that map-char-table in 21.5 is broken, because the test should return a one-element list, and it doesn't. The revised version of derived.el DTRT's on this test: (require 'jde) (let ((my-syntax-table (make-syntax-table))) (derived-mode-merge-syntax-tables java-mode-syntax-table my-syntax-table) my-syntax-table) and cannot throw the wrong-type error Hrvoje observes, so I recommend application. Index: lisp/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v retrieving revision 1.515 diff -u -U0 -r1.515 ChangeLog --- lisp/ChangeLog 17 Jul 2003 14:41:23 -0000 1.515 +++ lisp/ChangeLog 18 Jul 2003 07:19:59 -0000 ＠＠ -0,0 +1,6 ＠＠ +2005-04-06 Stephen J. Turnbull <stephen(a)xemacs.org> + + * derived.el (derived-mode-merge-syntax-tables): + Revert my 21.5-only patch of 2003-07-18 which slipped in + through Jerry James's patch of 2004-06-07. + Index: lisp/derived.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/derived.el,v retrieving revision 1.4.2.1 diff -u -r1.4.2.1 derived.el --- lisp/derived.el 22 Jun 2004 01:49:47 -0000 1.4.2.1 +++ lisp/derived.el 6 Apr 2005 07:01:34 -0000 ＠＠ -421,20 +421,12 ＠＠ ;; check for inheritance. (map-char-table #'(lambda (key value) - (let ((newval (get-range-char-table key new 'multi))) - (cond ((eq newval 'multi) ; OK, dive into the class hierarchy - (map-char-table - #'(lambda (key1 value1) - (when (eq ?＠ (char-syntax-from-code - (get-range-char-table key new ?＠))) - (put-char-table key1 value new)) - nil) - new - key)) - ((eq ?＠ (char-syntax-from-code newval)) ;; class at once - (put-char-table key value new)))) - nil) - old)) + (if (eq ?＠ (char-syntax-from-code value)) + (map-char-table #'(lambda (key1 value1) + (put-char-table key1 value1 new)) + old + key))) + new)) ;; Merge an old abbrev table into a new one. ;; This function requires internal knowledge of how abbrev tables work, -- School of Systems and Information Engineering 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.

2 participants
1 comments

[COMMIT] Mule-CCL couldn't handle control-1 characters either. 19 years, 1 month

Aidan Kehoe

NOTE: This patch has been committed. APPROVE COMMIT RECOMMEND 21.4, SXEmacs I was aware CCL was doing something like this for a long time; I just told myself that the code was part of XEmacs, it must be me who was getting stuff wrong. There’s an EBCDIC coding system, for example, at http://parhasard.net/ebcdic-na.el that works after this change has been applied. Also, writing a Windows-1252 coding system now becomes possible. src/ChangeLog addition: 2005-04-05 Aidan Kehoe <kehoea(a)parhasard.net> * mule-ccl.c (ccl_driver): Calculate the charset and position code for control-1 characters properly, both when reading multibyte characters and writing them. XEmacs Trunk source patch: Diff command: cvs -q diff -u Files affected: src/mule-ccl.c Index: src/mule-ccl.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/mule-ccl.c,v retrieving revision 1.25 diff -u -u -r1.25 mule-ccl.c --- src/mule-ccl.c 2004/09/20 19:19:52 1.25 +++ src/mule-ccl.c 2005/04/05 17:34:57 ＠＠ -1302,6 +1302,13 ＠＠ reg[RRR] = i; reg[rrr] = (*src++ & 0x7F); } + else if (LEADING_BYTE_CONTROL_1 == i) + { + if (src >= src_end) + goto ccl_read_multibyte_character_suspend; + reg[RRR] = i; + reg[rrr] = (*src++ - 0xA0); + } else if (i <= MAX_LEADING_BYTE_OFFICIAL_2) { if ((src + 1) >= src_end) ＠＠ -1349,7 +1356,7 ＠＠ case CCL_WriteMultibyteChar2: i = reg[RRR]; /* charset */ - if (i == LEADING_BYTE_ASCII) + if (i == LEADING_BYTE_ASCII || i == LEADING_BYTE_CONTROL_1) i = reg[rrr] & 0xFF; else if (XCHARSET_DIMENSION (charset_by_leading_byte (i)) == 1) i = (((i - FIELD2_TO_OFFICIAL_LEADING_BYTE) << 7) -- “I, for instance, am gung-ho about open source because my family is being held hostage in Rob Malda’s basement. But who fact-checks me, or Enderle, when we say something in public? No-one!” -- Danny O’Brien

2 participants
1 comments

[COMMIT] Cleanup of the CCL coding system example. 19 years, 1 month

Aidan Kehoe

NOTE: This patch has been committed. APPROVE COMMIT 21.5 RECOMMEND 21.4 This has been in my queue for far too long. man/ChangeLog addition: 2005-03-26 Aidan Kehoe <kehoea(a)parhasard.net> * lispref/mule.texi (CCL Example): char-int -> char-to-int, and hex 41 is decimal 64, both problems with my previous patch pointed out by Stephen. * lispref/mule.texi (The actual coding system): Give information on the make-coding-system call, and where the actual package can be found. XEmacs Trunk source patch: Diff command: cvs -q diff -u Files affected: man/lispref/mule.texi Index: man/lispref/mule.texi =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/lispref/mule.texi,v retrieving revision 1.12 diff -u -u -r1.12 mule.texi --- man/lispref/mule.texi 2005/03/09 05:36:50 1.12 +++ man/lispref/mule.texi 2005/03/26 16:16:17 ＠＠ -2097,7 +2097,7 ＠＠ * Characters to be preserved:: No transformation needed for these characters. * The program to decode to internal format:: . * The program to encode from internal format:: . - +* The actual coding system:: . ＠end menu ＠node Four bits to ASCII, URI Encoding constants, , CCL Example ＠＠ -2117,7 +2117,7 ＠＠ (let ((val (make-vector 256 0)) (i 0)) (while (< i (length val)) - (aset val i (char-int (aref (format "%02X" i) 0))) + (aset val i (char-to-int (aref (format "%02X" i) 0))) (setq i (1+ i))) val) "Table to find an ASCII version of an octet's most significant 4 bits.") ＠＠ -2125,7 +2125,7 ＠＠ The next table, ＠code{url-coding-low-order-nybble-as-ascii} is almost the same thing, but this time it has a map for the hex encoding of the -low-order four bits. So the sixty-fifth entry (offset ＠samp{#x51}) is +low-order four bits. So the sixty-fifth entry (offset ＠samp{#x41}) is the ASCII encoding of `1', the hundred-and-twenty-second (offset ＠samp{#x7a}) is the ASCII encoding of `A'. ＠＠ -2134,7 +2134,7 ＠＠ (let ((val (make-vector 256 0)) (i 0)) (while (< i (length val)) - (aset val i (char-int (aref (format "%02X" i) 1))) + (aset val i (char-to-int (aref (format "%02X" i) 1))) (setq i (1+ i))) val) "Table to find an ASCII version of an octet's least significant 4 bits.") ＠＠ -2154,14 +2154,14 ＠＠＠code{url-coding-escaped-space-code} variable. ＠example -(defvar url-coding-escape-character-code (char-int ?%) +(defvar url-coding-escape-character-code (char-to-int ?%) "The code point for the percentage sign, in ASCII.") -(defvar url-coding-escaped-space-code (char-int ?+) +(defvar url-coding-escaped-space-code (char-to-int ?+) "The URL-encoded value of the space character, that is, +.") ＠end example -＠node Numeric to ASCII-hexadecimal conversion +＠node Numeric to ASCII-hexadecimal conversion, Characters to be preserved, URI Encoding constants, CCL Example ＠subsubsection Numeric to ASCII-hexadecimal conversion Now, we have a couple of utility tables that wouldn't be necessary in ＠＠ -2177,7 +2177,7 ＠＠ (let ((i 0) (val (make-vector 16 0))) (while (< i 16) - (aset val i (char-int (aref (format "%X" i) 0))) + (aset val i (char-to-int (aref (format "%X" i) 0))) (setq i (1+ i))) val) "A map from a hexadecimal digit's numeric value to its encoding in ASCII.") ＠＠ -2193,7 +2193,7 ＠＠ "A map from Latin 1 code points to their values as hexadecimal digits.") ＠end example -＠node Characters to be preserved +＠node Characters to be preserved, The program to decode to internal format, Numeric to ASCII-hexadecimal conversion, CCL Example ＠subsubsection Characters to be preserved And finally, the last of these tables. URL encoding says that ＠＠ -2227,7 +2227,7 ＠＠ octet as its ASCII encoding.") ＠end example -＠node The program to decode to internal format +＠node The program to decode to internal format, The program to encode from internal format, Characters to be preserved, CCL Example ＠subsubsection The program to decode to internal format After the almost interminable tables, we get to the CCL. The first ＠＠ -2288,7 +2288,7 ＠＠ internal encoding. ") ＠end example -＠node The program to encode from internal format +＠node The program to encode from internal format, The actual coding system, The program to decode to internal format, CCL Example ＠subsubsection The program to encode from internal format Next, we see the CCL program to encode ASCII text as URL coded text. ＠＠ -2323,6 +2323,36 ＠＠ (repeat)))) "CCL program to encode octets (almost) according to RFC 1738") ＠end example + +＠node The actual coding system, , The program to encode from internal format, CCL Example +＠subsubsection The actual coding system + +To actually create the coding system, we call +＠samp{make-coding-system}. The first argument is the symbol that is to +be the name of the coding system, in our case ＠samp{url-coding}. The +second specifies that the coding system is to be of type +＠samp{ccl}---there are several other coding system types available, +including, see the documentation for ＠samp{make-coding-system} for the +full list. Then there's a documentation string describing the wherefore +and caveats of the coding system, and the final argument is a property +list giving information about the CCL programs and the coding system's +mnemonic. + +＠example +(make-coding-system + 'url-coding 'ccl + "The coding used by application/x-www-form-urlencoded HTTP applications. +This coding form doesn't specify anything about non-ASCII characters, so +make sure you've transformed to a seven-bit coding system first." + '(decode ccl-decode-urlcoding + encode ccl-encode-urlcoding + mnemonic "URLenc")) +＠end example + +If you're lucky, the ＠samp{url-coding} coding system describe here +should be available in the XEmacs package system. Otherwise, downloading +it from ＠samp{http://www.parhasard.net/url-coding.el} should work for +the foreseeable future. ＠node Category Tables, Unicode Support, CCL, MULE ＠section Category Tables -- “I, for instance, am gung-ho about open source because my family is being held hostage in Rob Malda’s basement. But who fact-checks me, or Enderle, when we say something in public? No-one!” -- Danny O’Brien

2 participants
2 comments

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

XEmacs-Patches October 2005