[COMMIT] Document that START and END are zero-based for insert-file-contents
17 years, 2 months
Aidan Kehoe
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed.
lisp/ChangeLog addition:
2007-10-02 Aidan Kehoe <kehoea(a)parhasard.net>
* code-files.el (insert-file-contents):
Document that START and END are zero-based, in contrast to buffer
offsets, and give an example of their use.
XEmacs Trunk source patch:
Diff command: cvs -q diff -Nu
Files affected: lisp/code-files.el
===================================================================
RCS
Index: lisp/code-files.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/code-files.el,v
retrieving revision 1.21
diff -u -u -r1.21 code-files.el
--- lisp/code-files.el 2007/05/12 13:12:28 1.21
+++ lisp/code-files.el 2007/10/02 20:07:49
＠＠ -357,8 +357,11 ＠＠
If visiting and the file does not exist, visiting is completed
before the error is signaled.
-The optional third and fourth arguments START and END
-specify what portion of the file to insert.
+The optional third and fourth arguments START and END specify what portion
+of the file to insert, and start at zero, in direct and needless contrast to
+buffer offsets. That is, values of 0 and 10 for START and END respectively
+will give the first ten octets of a file.
+
If VISIT is non-nil, START and END must be nil.
If optional fifth argument REPLACE is non-nil,
it means replace the current buffer contents (in the accessible portion)
--
On the quay of the little Black Sea port, where the rescued pair came once
more into contact with civilization, Dobrinton was bitten by a dog which was
assumed to be mad, though it may only have been indiscriminating. (Saki)
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
[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
[C] xemacsweb: Document TEXI2HTML settings for master websites
17 years, 2 months
Adrian Aichner
Adrian Aichner
COMMIT
xemacsweb ChangeLog patch:
Diff command: cvs -q diff -U 0
Files affected: ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/ChangeLog,v
retrieving revision 1.274
diff -u -U0 -r1.274 ChangeLog
--- ChangeLog 2 Oct 2007 18:38:49 -0000 1.274
+++ ChangeLog 2 Oct 2007 19:41:34 -0000
＠＠ -2,0 +3,5 ＠＠
+ * Local.rules.template: Document TEXI2HTML settings for master
+ websites.
+
+2007-10-02 Adrian Aichner <adrian(a)xemacs.org>
+
xemacsweb source patch:
Diff command: cvs -f -z3 -q diff -u -w -N
Files affected: Local.rules.template
===================================================================
RCS
Index: Local.rules.template
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Local.rules.template,v
retrieving revision 1.8
diff -u -w -r1.8 Local.rules.template
--- Local.rules.template 2 Oct 2007 18:38:49 -0000 1.8
+++ Local.rules.template 2 Oct 2007 19:40:55 -0000
＠＠ -43,6 +43,10 ＠＠
TEXI2HTML = texi2html
# www.xemacs.org:
# TEXI2HTML = perl /web/http-xemacs/xemacsweb/Texi2html/texi2html
+# www.sunsite.dk:
+# TEXI2HTML = perl /pack/ftp/projects/xemacs/xemacsweb/Texi2html/texi2html
+# www.us.xemacs.org:
+# TEXI2HTML = perl /home/groups/x/xe/xemacs/xemacsweb/Texi2html/texi2html
# TANG:
# TEXI2HTML=perl "c:/Hacking/cvs.xemacs.org/XEmacs/xemacsweb/Texi2html/texi2html"
--
Adrian Aichner
mailto:adrian＠xemacs.org
http://www.xemacs.org/
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 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
[C] xemacsweb: Add rules for generation of XEmacs and packages online docs
17 years, 2 months
Adrian Aichner
Adrian Aichner
COMMIT
Will test this on master websites now, after local testing on my
system at home.
Adrian
Documentation/ChangeLog addition:
2007-10-02 Adrian Aichner <adrian(a)xemacs.org>
* Makefile: Add rules beta-html and packages-html.
* .cvsignore: Add sources directory.
ChangeLog addition:
2007-10-02 Adrian Aichner <adrian(a)xemacs.org>
* Local.rules.template (TEXI2HTML): New definition to adapt to
local system.
* Local.rules.template (HTML_FILES): Fix and update for generated docs.
* Makefile (Documentation): New rule.
xemacsweb source patch:
Diff command: cvs -f -z3 -q diff -u -w -N
Files affected: Documentation/Makefile
===================================================================
RCS Documentation/.cvsignore
===================================================================
RCS Makefile
===================================================================
RCS Local.rules.template
===================================================================
RCS
Index: Local.rules.template
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Local.rules.template,v
retrieving revision 1.7
diff -u -w -r1.7 Local.rules.template
--- Local.rules.template 11 Feb 2006 18:39:47 -0000 1.7
+++ Local.rules.template 2 Oct 2007 18:37:01 -0000
＠＠ -2,13 +2,14 ＠＠
# APA: This is what I use on my Windows 2000 machine:
XEMACS=xemacs
-# XEMACS="/cygdrive/c/Program Files/XEmacs/XEmacs-21.1.14/i386-pc-win32/xemacs.exe"
+# XEMACS=c:/PROGRA~1/XEmacs/XEmacs-21.1.14/i386-pc-win32/xemacs.exe
+# XEMACS=/cygdrive/c/PROGRA~1/XEmacs/XEmacs-21.1.14/i386-pc-win32/xemacs.exe
# FLAGS=-batch -q -no-site-file
FLAGS=-batch -vanilla
# APA: Windows has its own, inadequate find, use Cygwin instead!
FIND=find
-# FIND="/cygdrive/c/cygwin/bin/find.exe"
+# FIND=c:/cygwin/bin/find.exe
# APA: Where to find and how to run linklint.
LINKLINT=linklint
＠＠ -30,7 +31,7 ＠＠
CONTENT_FILES=$(shell $(FIND) . -path ./genpage -prune -o -name "*.content" -print)
GENERATED_HTML_FILES=$(CONTENT_FILES:.content=.html)
# APA: Files generated by texi2html do not need to be validated.
-HTML_FILES=$(shell $(FIND) . \( -path ./Documentation/21.5/html -o -path ./Documentation/packages/html -o -path "./linklint*" -prune \) -o -name "*.html" -print)
+HTML_FILES=$(shell $(FIND) . \( -path "./Documentation/21.5/html/*" -o -path "./Documentation/packages/html/*" -o -path "./linklint*" -o -path "./Documentation/sources/*" -prune \) -o -name "*.html" -print)
# mknmz command
# used to reindex the site for namazu
＠＠ -38,6 +39,12 ＠＠
# location of namazu index directory
# Only www.xemacs.org is setup up for namazu indexing as of 2006-02-11.
NAMAZU_INDEX_DIR=/web/http-xemacs/var/namazu/index
+
+TEXI2HTML = texi2html
+# www.xemacs.org:
+# TEXI2HTML = perl /web/http-xemacs/xemacsweb/Texi2html/texi2html
+# TANG:
+# TEXI2HTML=perl "c:/Hacking/cvs.xemacs.org/XEmacs/xemacsweb/Texi2html/texi2html"
#
# Local Variables:
Index: Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Makefile,v
retrieving revision 1.55
diff -u -w -r1.55 Makefile
--- Makefile 11 Feb 2006 19:32:01 -0000 1.55
+++ Makefile 2 Oct 2007 18:37:01 -0000
＠＠ -114,6 +114,9 ＠＠
rm -f htdocs-time-stamp
rm -f validate-time-stamp
+Documentation: FORCE
+ cd $＠ && $(MAKE) TEXI2HTML="$(TEXI2HTML)" all
+
Download/win32: FORCE
cd $＠ && $(MAKE)
Index: Documentation/.cvsignore
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Documentation/.cvsignore,v
retrieving revision 1.1
diff -u -w -r1.1 .cvsignore
--- Documentation/.cvsignore 2 Sep 2000 03:07:35 -0000 1.1
+++ Documentation/.cvsignore 2 Oct 2007 18:37:01 -0000
＠＠ -1 +1,2 ＠＠
*.html
+sources
Index: Documentation/Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Documentation/Makefile,v
retrieving revision 1.2
diff -u -w -r1.2 Makefile
--- Documentation/Makefile 23 Jun 2007 09:33:44 -0000 1.2
+++ Documentation/Makefile 2 Oct 2007 18:37:01 -0000
＠＠ -1,35 +1,65 ＠＠
# Adrian Aichner (APA), Adrian.Aichner(a)T-Online.De, XEmacs.Org, 2001-04-01.
-TEXI2HTML="perl ../../../Texi2html/texi2html -verbose -split chapter"
-
#
# Update BETA, GAMMA, and STABLE whenever new versions are released.
# Then Re-run make to build new online documentation.
#
-BETA = HEAD
-GAMMA = r21-4-6rc1
-STABLE = r21-1-14
-
-all: beta
-
-beta: $(BETA)
-gamma: $(GAMMA)
-stable: $(STABLE)
-# $(BETA):
-# cvs -f -z3 -d:pserver:cvs＠cvs.xemacs.org:/pack/xemacscvs export -d beta -r $(BETA) xemacs/man/term.texi xemacs/info
-# cd beta/xemacs/man && $(MAKE)
-
-$(BETA):
- cvs -f -z3 -d:pserver:cvs＠cvs.xemacs.org:/pack/xemacscvs export -r $(BETA) -d beta xemacs/man
- cd beta/man && $(MAKE) TEXI2HTML=$(TEXI2HTML) html
-
-$(GAMMA):
- cvs -f -z3 -d:pserver:cvs＠cvs.xemacs.org:/pack/xemacscvs export -d gamma -r $(GAMMA) xemacs/man
- cd gamma/man
+# Need to insert directory level without CVS control files, so that
+# cvs update of working directory of xemacsweb CVS module will not
+# descend into working directories from xemacs and packages CVS
+# modules.
+SOURCES = sources
+
+BETA_TAG = HEAD
+BETA_DIR = xemacs-21.5
+# There is no GAMMA as of 2007-09-30
+GAMMA = r21-4-6rc1
+GAMMA_DIR = xemacs-21.4
+STABLE_TAG = r21-4-20
+STABLE_DIR = xemacs-21.4
+
+PACKAGES_TAG = HEAD
+# covers mule and non-mule packages
+PACKAGES_DIR = xemacs-packages
+STAGING = $(shell pwd)/packages
+
+all: beta-html packages-html
+
+beta-html:
+ if test ! -d $(SOURCES)/$(BETA_DIR)/man; then \
+ mkdir $(SOURCES); \
+ cd $(SOURCES); \
+ cvs -f -z3 -d:pserver:cvs＠cvs.xemacs.org:/pack/xemacscvs co -r $(BETA_TAG) -d $(BETA_DIR) xemacs/etc/photos; \
+ cvs -f -z3 -d:pserver:cvs＠cvs.xemacs.org:/pack/xemacscvs co -r $(BETA_TAG) -d $(BETA_DIR) xemacs/man; \
+ cd ..; \
+ else \
+ cd $(SOURCES)/$(BETA_DIR)/etc/photos; \
+ cvs -f -z3 -d:pserver:cvs＠cvs.xemacs.org:/pack/xemacscvs update -r $(BETA_TAG) -Pd; \
+ cd ../../../..; \
+ cd $(SOURCES)/$(BETA_DIR)/man; \
+ cvs -f -z3 -d:pserver:cvs＠cvs.xemacs.org:/pack/xemacscvs update -r $(BETA_TAG) -Pd; \
+ cd ../../..; \
+ fi;
+ cd $(SOURCES)/$(BETA_DIR)/man && $(MAKE) TEXI2HTML="$(TEXI2HTML)" HTMLDIR="../../../21.5/html" html
+
+# cvs -f -z3 -d:pserver:cvs＠cvs.xemacs.org:/pack/xemacscvs co -r $(PACKAGES_TAG) -N -d $(PACKAGES_DIR) packages; \
+
+# time will tell whether master websites need setups different from
+# Local.rules.template
+packages-html:
+ if test ! -d $(SOURCES)/$(PACKAGES_DIR)/packages; then \
+ mkdir $(SOURCES); \
+ cd $(SOURCES); \
+ cvs -f -z3 -d:pserver:cvs＠cvs.xemacs.org:/pack/xemacscvs co -r $(PACKAGES_TAG) -N -d $(PACKAGES_DIR) packages; \
+ cp $(PACKAGES_DIR)/packages/Local.rules.template $(PACKAGES_DIR)/packages/Local.rules; \
+ cd ..; \
+ else \
+ cd $(SOURCES)/$(PACKAGES_DIR)/packages; \
+ cvs update; \
+ cd ../../..; \
+ fi;
+ cd $(SOURCES)/$(PACKAGES_DIR)/packages && $(MAKE) TEXI2HTML="$(TEXI2HTML)" XEMACS="$(XEMACS)" STAGING="$(STAGING)" install-html
-$(STABLE):
- cvs -f -z3 -d:pserver:cvs＠cvs.xemacs.org:/pack/xemacscvs export -d stable -r $(STABLE) xemacs/man
- cd stable/man
FORCE:
--
Adrian Aichner
mailto:adrian＠xemacs.org
http://www.xemacs.org/
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
[PATCH] Fix some bugs in the Unicode error sequence Lisp API.
17 years, 2 months
Aidan Kehoe
Aidan Kehoe
I’ve mostly been using Michael’s Mercurial repository this weekend (in the
absence of cvs.xemacs.org), and I do really like the tool so far.
lisp/ChangeLog addition:
2007-09-09 Aidan Kehoe <kehoea(a)parhasard.net>
* unicode.el (unicode-error-default-translation-table):
New. A char table mapping from Unicode error octets (as
represented in XEmacs) to ASCII, Control-1 and latin-iso8859-1.
* unicode.el (unicode-error-sequence-regexp-range):
Correct it, add a build-time check that it matches every possible
error octet.
* unicode.el (frob-unicode-errors-region) New.
Apply a supplied function to each set of error sequences in a
region.
* unicode.el (unicode-error-translate-region) New.
Translate the error octets in a region to the corresponding
ASCII, control-1 and latin-1 characters.
diff -r 33f6ee3a6e75 lisp/unicode.el
--- a/lisp/unicode.el Thu Sep 06 21:51:29 2007 +0000
+++ b/lisp/unicode.el Sun Sep 09 11:38:27 2007 +0200
＠＠ -496,41 +496,109 ＠＠ The second argument must be 'ucs, the th
;; Create all the Unicode error sequences, normally as jit-ucs-charset-0
;; characters starting at U+200000 (which isn't a valid Unicode code
- ;; point).
- (loop
- for i from #x00 to #xFF
- ;; #xd800 is the first leading surrogate; trailing surrogates must be in
- ;; the range #xdc00-#xdfff. These examples are not, so we intentionally
- ;; provoke an error sequence.
- do (decode-coding-string (format "\xd8\x00\x01%c" i) 'utf-16-be))
-
- ;; Make them available to user code.
- (defvar unicode-error-sequence-zero
- (aref (decode-coding-string "\xd8\x00\x01\x00" 'utf-16-be) 3)
- "The XEmacs character representing an invalid zero octet in Unicode.
-
-Subtract this character from each XEmacs character in an invalid sequence to
-get the octet on disk. E.g.
-
-\(- (aref (decode-coding-string ?\\x80 'utf-8) 0)
- unicode-error-characters-zero)
-=> ?\\x80
-
-You can search for invalid sequences using
-`unicode-error-sequence-regexp-range', which see. ")
+ ;; point). Make them available to user code.
+ (defvar unicode-error-default-translation-table
+ (loop
+ with char-table = (make-char-table 'char)
+ for i from ?\x00 to ?\xFF
+ do
+ (put-char-table (aref
+ ;; #xd800 is the first leading surrogate;
+ ;; trailing surrogates must be in the range
+ ;; #xdc00-#xdfff. These examples are not, so we
+ ;; intentionally provoke an error sequence.
+ (decode-coding-string (format "\xd8\x00\x00%c" i)
+ 'utf-16-be)
+ 3)
+ i
+ char-table)
+ finally return char-table)
+ "Translation table mapping Unicode error sequences to Latin-1 chars.
+
+To transform XEmacs Unicode error sequences to the Latin-1 characters that
+correspond to the octets on disk, you can use this variable. ")
(defvar unicode-error-sequence-regexp-range
- (format "%c-%c"
- (aref (decode-coding-string "\xd8\x00\x01\x00" 'utf-16-be) 3)
- (aref (decode-coding-string "\xd8\x00\x01\xFF" 'utf-16-be) 3))
+ (format "%c%c-%c"
+ (aref (decode-coding-string "\xd8\x00\x00\x00" 'utf-16-be) 0)
+ (aref (decode-coding-string "\xd8\x00\x00\x00" 'utf-16-be) 3)
+ (aref (decode-coding-string "\xd8\x00\x00\xFF" 'utf-16-be) 3))
"Regular expression range to match Unicode error sequences in XEmacs.
-Invalid Unicode sequences on input are represented as XEmacs characters with
-values starting at `unicode-error-sequence-zero', one character for each
-invalid octet. Use this variable (with `re-search-forward' or
-`skip-chars-forward') to search for such characters; use
-`unicode-error-sequence-zero' from such characters to get a character
-corresponding to the octet on disk. "))
+Invalid Unicode sequences on input are represented as XEmacs
+characters with values stored as the keys in
+`unicode-error-default-translation-table', one character for each
+invalid octet. You can use this variable (with `re-search-forward' or
+`skip-chars-forward') to search for such characters; see also
+`unicode-error-translate-region'. ")
+
+ ;; Check that the lookup table is correct, and that all the actual error
+ ;; sequences are caught by the regexp.
+ (with-temp-buffer
+ (loop
+ for i from ?\x00 to ?\xFF
+ with to-check = (make-string 20 ?\x20)
+ with res = t
+ do
+ (delete-region (point-min) (point-max))
+ (insert to-check)
+ (goto-char 10)
+ (insert (decode-coding-string (format "\xd8\x00\x00%c" i)
+ 'utf-16-be))
+ (backward-char)
+ (assert (= i (get-char-table (char-after (point))
+ unicode-error-default-translation-table))
+ (format "Char ?\\x%x not the expected error sequence!"
+ i))
+
+ (goto-char (point-min))
+ (assert (re-search-forward (concat "["
+ unicode-error-sequence-regexp-range
+ "]"))
+ nil
+ (format "Could not find char ?\\x%x in buffer" i))))
+
+ (defun frob-unicode-errors-region (frob-function begin end &optional buffer)
+ "Call FROB-FUNCTION on the Unicode error sequences between BEGIN and END.
+
+Optional argument BUFFER specifies the buffer that should be examined for
+such sequences. "
+ (check-argument-type #'functionp frob-function)
+ (check-argument-range begin (point-min buffer) (point-max buffer))
+ (check-argument-range end (point-min buffer) (point-max buffer))
+ (save-excursion
+ (save-restriction
+ (if buffer (set-buffer buffer))
+ (narrow-to-region begin end)
+ (goto-char (point-min))
+ (while end
+ (setq begin
+ (progn
+ (skip-chars-forward
+ (concat "^" unicode-error-sequence-regexp-range))
+ (point))
+ end (and (not (= (point) (point-max)))
+ (progn
+ (skip-chars-forward
+ unicode-error-sequence-regexp-range)
+ (point))))
+ (if end
+ (funcall frob-function begin end))))))
+
+ (defun unicode-error-translate-region (begin end &optional buffer table)
+ "Translate the Unicode error sequences in BUFFER between BEGIN and END.
+
+The error sequences are transformed, by default, into the ASCII,
+control-1 and latin-iso8859-1 characters with the numeric values
+corresponding to the incorrect octets encountered. This is achieved
+by using `unicode-error-default-translation-table' (which see) for
+TABLE; you can change this by supplying another character table,
+mapping from the error sequences to the desired characters. "
+ (unless table (setq table unicode-error-default-translation-table))
+ (frob-unicode-errors-region
+ (lambda (start finish)
+ (translate-region start finish table))
+ begin end buffer)))
;; #### UTF-7 is not yet implemented, and it's tricky to do. There's
;; an implementation in appendix A.1 of the Unicode Standard, Version
--
On the quay of the little Black Sea port, where the rescued pair came once
more into contact with civilization, Dobrinton was bitten by a dog which was
assumed to be mad, though it may only have been indiscriminating. (Saki)
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 1 comments
Re: [COMMIT] xemacs-packages/os-utils/crypt.el improvements
17 years, 2 months
Aidan Kehoe
Aidan Kehoe
Ar an naoú lá is fiche de mí Méan Fómhair, scríobh Jari Aalto:
> Here are small patches that I have had in my own version of crypt for
> years. I recently spoke with Karl about submitting them forward, so here
> they are.
Thank you Jari!
(The below only differs from your changes in whitespace, but I post in in
order to have at least one copy of the change end up on -patches.)
APPROVE COMMIT
NOTE: This patch has been committed.
xemacs-packages/os-utils/ChangeLog addition:
2007-09-29 Jari Aalto <jari.aalto AT cante.net>
* crypt.el
(crypt-encryption-type-get): New function.
(crypt-encryption-type-set): New function.
(crypt-decrypt-buffer): New interactive function.
(crypt-encrypted-p): Call `crypt-encryption-type-set' to set
correct `crypt-encryption-type'.
(crypt-build-encryption-alist): Add entry for
bcrypt program: *.bfe files.
XEmacs Packages source patch:
Diff command: cvs -q diff -u
Files affected: xemacs-packages/os-utils/crypt.el
===================================================================
RCS
Index: xemacs-packages/os-utils/crypt.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/os-utils/crypt.el,v
retrieving revision 1.7
diff -u -r1.7 crypt.el
--- xemacs-packages/os-utils/crypt.el 2006/09/04 06:16:11 1.7
+++ xemacs-packages/os-utils/crypt.el 2007/10/02 09:27:09
＠＠ -919,7 +919,19 ＠＠
t
nil
)
- ;; Add new elements here ...
+ (list 'bfe
+ ;; See http://sourceforge.net/projects/bcrypt
+ crypt-encryption-magic-regexp crypt-encryption-magic-regexp-inverse
+ (or crypt-encryption-file-extension "\\(\\.bfe\\)$")
+ "bcrypt" "bcrypt"
+ '("")
+ '("")
+ "BFE"
+ nil
+ t
+ nil
+ )
+ ;; Add new elements here ...
))
(defconst crypt-encryption-alist (crypt-build-encryption-alist)
＠＠ -1552,6 +1564,24 ＠＠
(setq alist (cdr alist))))
found))))
+(defun crypt-encryption-type-get (file)
+ "Determine type of encryption from file extension."
+ (let (ret
+ regexp)
+ (dolist (elt crypt-encryption-alist)
+ (setq regexp (nth 3 elt))
+ (if (and (stringp regexp)
+ (string-match regexp file))
+ (return (nth 0 elt))))))
+
+(defun crypt-encryption-type-set ()
+ "Set `crypt-encryption-type'"
+ (let (type)
+ (if (setq type (crypt-encryption-type-get buffer-file-name))
+ (progn
+ (setq crypt-encryption-type type)
+ (crypt-rebuild-tables)))))
+
(defun crypt-encrypted-p (&optional buffer)
;; Returns t if current buffer, or optionally BUFFER, is encrypted.
;; Look for MAGIC-REGEXP and absence of MAGIC-REGEXP-INVERSE. If so, then
＠＠ -1567,7 +1597,7 ＠＠
(save-restriction
(widen)
(goto-char (point-min))
-
+ (crypt-encryption-type-set)
(let ((magic-regexp (crypt-get-magic-regexp crypt-encryption-type))
(magic-regexp-inverse (crypt-get-magic-regexp-inverse
crypt-encryption-type))
＠＠ -2127,6 +2157,17 ＠＠
(save-excursion (set-buffer buffer)
(crypt-encrypt-region (point-min) (point-max) key decrypt)))
+(defun crypt-decrypt-buffer (key)
+ "Use KEY to decrypt current buffer."
+ (interactive
+ (let (pass)
+ (barf-if-buffer-read-only)
+ (list
+ (crypt-read-string-no-echo
+ "Decrypt buffer using key: "))))
+ (setq crypt-buffer-encryption-key key)
+ (crypt-encrypt-region (point-min) (point-max) key 'decrypt))
+
;;;; ENCODING
＠＠ -2748,7 +2789,7 ＠＠
;; Similar to `insert-file-contents' except decoding/decrypting of FILE
;; attempted. See `crypt-insert-file' and `crypt-auto-decode-insert'
-;;
+;;
(defun crypt-insert-file-contents (file)
(let (temp-buffer
temp-list
--
On the quay of the little Black Sea port, where the rescued pair came once
more into contact with civilization, Dobrinton was bitten by a dog which was
assumed to be mad, though it may only have been indiscriminating. (Saki)
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
[AC21.5] [R21.4] Really make face-boolean specifiers
17 years, 2 months
Didier Verna
Didier Verna
NOTE: This patch has been committed. The version below is
informational only (whitespace differences have been removed).
Dear reviewers,
this patch makes make-face-boolean-specifier make a...
face-boolean specifier (wao :-). Plus a small doc fix. Strongly
recommended for 21.4.
lisp/ChangeLog addition:
2007-10-02 Didier Verna <didier(a)xemacs.org>
* objects.el (make-face-boolean-specifier): Fix docstring, really
make a face-boolean specifier (not a color one).
XEmacs source patch:
Diff command: cvs -q diff -u -t -b -B -w
Files affected: lisp/objects.el
Index: lisp/objects.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/objects.el,v
retrieving revision 1.6
diff -u -u -t -b -B -w -r1.6 objects.el
--- lisp/objects.el 29 Nov 2005 12:08:36 -0000 1.6
+++ lisp/objects.el 2 Oct 2007 07:50:54 -0000
＠＠ -186,12 +186,12 ＠＠
Valid instantiators for face-boolean specifiers are
-- t or nil
--- a vector of two or three elements: a face to inherit from,
+-- a vector of one, two or three elements: a face to inherit from,
optionally a symbol naming the property of that face to inherit from
(if omitted, defaults to the same property that this face-boolean
specifier is used for; if this specifier is not part of a face,
the instantiator would not be valid), and optionally a value which,
if non-nil, means to invert the sense of the inherited property."
- (make-specifier-and-init 'color spec-list))
+ (make-specifier-and-init 'face-boolean spec-list))
;;; objects.el ends here.
--
New ＠-quartet featured CD Review !!
http://www.indie-music.com/modules.php?name=News&file=article&sid=6457
Didier Verna, didier(a)lrde.epita.fr, http://www.lrde.epita.fr/~didier
EPITA / LRDE, 14-16 rue Voltaire Tel.+33 (1) 44 08 01 85
94276 Le Kremlin-Bicêtre, France Fax.+33 (1) 53 14 59 22 didier(a)xemacs.org
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
[PATCH] Don't set the current langenv to ja just because someone used a japanese IM
17 years, 2 months
Aidan Kehoe
Aidan Kehoe
mule-packages/skk/ChangeLog addition:
2007-08-15 Aidan Kehoe <kehoea(a)parhasard.net>
* skk-leim.el (skk-leim):
Setting the current language environment to Japanese just because
skk-leim.el was loaded is wrong.
XEmacs Packages source patch:
Diff command: cvs -q diff -Nu
Files affected: mule-packages/skk/skk-leim.el
===================================================================
RCS
Index: mule-packages/skk/skk-leim.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/skk/skk-leim.el,v
retrieving revision 1.4
diff -u -u -r1.4 skk-leim.el
--- mule-packages/skk/skk-leim.el 2000/11/08 01:51:44 1.4
+++ mule-packages/skk/skk-leim.el 2007/08/14 23:07:05
＠＠ -67,10 +67,5 ＠＠
'skk-auto-fill-activate nil
"Simple Kana to Kanji conversion program with auto-fill")
-(unless (string= current-language-environment "Japanese")
- (set-language-environment "Japanese"))
-(setq-default default-input-method "japanese-skk")
-(setq default-input-method "japanese-skk")
-
(provide 'skk-leim)
;;; skk-leim.el ends here
--
On the quay of the little Black Sea port, where the rescued pair came once
more into contact with civilization, Dobrinton was bitten by a dog which was
assumed to be mad, though it may only have been indiscriminating. (Saki)
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 1 comments
[AC] carbon2: Remove generated files from VC
17 years, 2 months
Marcus Crestani
Marcus Crestani
APPROVE COMMIT carbon2
NOTE: This patch has been committed
2007-10-01 Marcus Crestani <crestani(a)xemacs.org>
* .dbxrc:
* .dbxrc.in:
* .gdbinit:
* .gdbinit.in: All get generated, remove from VC.
--
Marcus
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments