[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
Rationalize specifying "where the packages are" somewhat
18 years, 12 months
Michael Sperber
Michael Sperber
This does away with the "--package-prefix" kludge and instead adds
configure options (with associated environment variables):
--with-early-packages (ultimately defaults to ~/.xemacs)
--with-late-packages (ultimately defaults to ../lib/xemacs)
--with-last-packages
that allow you to say where the packages are. What's good is that
people can specify one of these without screwing up the other ones.
It also fits much more naturally with the internal model. I've also
cleaned up some of the stuff hanging off it.
I'll wait until Sunday with this. Once it's settled down (I'm sure
I'll have screwed up something), I'll make another pass over the
documentation. (Long overdue, I know.)
Index: ChangeLog
2005-11-25 Mike Sperber <mike(a)xemacs.org>
* CHANGES-beta:
* configure.ac: Zap --with-package-prefix; instead, add
--with-early-packages, --with-late-packages, and
--with-last-packages.
Index: src/ChangeLog
2005-11-25 Mike Sperber <mike(a)xemacs.org>
* nt.c (init_mswindows_environment): Add EMACSEARLYPACKAGES,
EMACSLATEPACKAGES, EMACSLASTPACKAGES.
* config.h.in:
(PATH_EARLY_PACKAGE_DIRECTORIES, PATH_LATE_PACKAGE_DIRECTORIES)
(PATH_LAST_PACKAGE_DIRECTORIES): Add.
* paths.h.in:
(PATH_EARLY_PACKAGE_DIRECTORIES, PATH_LATE_PACKAGE_DIRECTORIES)
(PATH_LAST_PACKAGE_DIRECTORIES): Add.
* emacs.c: Add Vconfigure_early_package_directories,
Vconfigure_late_package_directories,
Vconfigure_last_package_directories.
(complex_vars_of_emacs): Set them.
Index: lisp/ChangeLog
2005-11-25 Mike Sperber <mike(a)xemacs.org>
* packages.el (packages-find-package-hierarchies-named): Use
`file-name-as-directory' to normalize something which may not
have a trailing path separator.
* package-get.el (package-get-package-index-file-location): Fix
essentially bogus definition.
* package-admin.el (package-admin-find-top-directory): Use the
existing variables rather than groking the paths from scratch, and
greatly simplify.
* packages.el (packages-find-all-package-hierarchies):
Take into account `configure-early-package-hierarchies',
`configure-late-package-hierarchies',
`configure-last-package-hierarchies', as set by configure.
Index: man/ChangeLog
2005-11-25 Mike Sperber <mike(a)xemacs.org>
* lispref/packaging.texi (The User View):
* xemacs/startup.texi (Startup Paths):
* xemacs-faq.texi (Q2.1.6): Document new configure options and
environment variables for
package locations.
Index: netinstall/ChangeLog
2005-11-25 Mike Sperber <mike(a)xemacs.org>
* reginfo.h (XEMACS_INFO_XEMACS_EARLY_PACKAGES_KEY)
(XEMACS_INFO_XEMACS_LATE_PACKAGES_KEY)
(XEMACS_INFO_XEMACS_LAST_PACKAGES_KEY): Add.
--
Cheers =8-} Mike
Friede, Völkerverständigung und überhaupt blabla
Index: CHANGES-beta
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/CHANGES-beta,v
retrieving revision 1.231
diff -u -r1.231 CHANGES-beta
--- CHANGES-beta 26 Oct 2005 13:15:44 -0000 1.231
+++ CHANGES-beta 25 Nov 2005 17:36:55 -0000
＠＠ -268,8 +268,7 ＠＠
-- New: support NetBSD sound via Linux API. -- Aidan Kehoe
-- Improve: generation of CFLAGS (Jerry James, Ben Wing
-- Improve: parallel build support. -- Malcolm Purvis
--- Improve: support --package-prefix as simple interface to --package-path
- facility. -- Ben Wing
+-- Improve: supersede --package-path by --with-{early,late,last}--packages
-- Improve: support mmdf and pop arguments to --mail-locking. -- Ben Wing
Documentation
Index: INSTALL
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/INSTALL,v
retrieving revision 1.45
diff -u -r1.45 INSTALL
--- INSTALL 7 Nov 2005 08:49:17 -0000 1.45
+++ INSTALL 25 Nov 2005 17:37:00 -0000
＠＠ -875,7 +875,7 ＠＠
--with-site-lisp Unchanged
--with-site-modules Unchanged
---package-prefix --with-package-prefix
+--package-prefix --with-late-packages
--package-path --with-package-path
--infopath --with-infopath
Index: configure.ac
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v
retrieving revision 1.22
diff -u -r1.22 configure.ac
--- configure.ac 25 Nov 2005 01:41:36 -0000 1.22
+++ configure.ac 25 Nov 2005 17:37:16 -0000
＠＠ -619,11 +619,17 ＠＠
XE_MERGED_ARG([site-modules],
AC_HELP_STRING([--with-site-modules=no],[Disable site-modules directory in the XEmacs hierarchy, which is searched before the installation modules.]),
[], [])
-XE_MERGED_ARG([package-prefix],
- AC_HELP_STRING([--with-package-prefix=DIR],[Specify packages root.]),
- [AC_DEFINE(PACKAGE_PATH_USER_DEFINED)], [])
+XE_MERGED_ARG([early-packages],
+ AC_HELP_STRING([--with-early-packages=DIR],[Specify location of early packages (instead of ~/.xemacs).]),
+ [AC_DEFINE(EARLY_PACKAGE_DIRECTORIES_USER_DEFINED)], [])
+XE_MERGED_ARG([late-packages],
+ AC_HELP_STRING([--with-late-packages=DIR],[Specify location of late packages (instead of default location).]),
+ [AC_DEFINE(LATE_PACKAGE_DIRECTORIES_USER_DEFINED)], [])
+XE_MERGED_ARG([last-packages],
+ AC_HELP_STRING([--with-last-packages=DIR],[Specify location of last packages (instead of default location).]),
+ [AC_DEFINE(LAST_PACKAGE_DIRECTORIES_USER_DEFINED)], [])
XE_MERGED_ARG([package-path],
- AC_HELP_STRING([--with-package-path=PATH],[Search path for package hierarchies.]),
+ AC_HELP_STRING([--with-package-path=PATH],[Search path for package directories.]),
[AC_DEFINE(PACKAGE_PATH_USER_DEFINED)], [])
XE_MERGED_ARG([infopath],
AC_HELP_STRING([--with-infopath=PATH],[Location of info directories]),
＠＠ -5495,13 +5501,38 ＠＠
done
AC_SUBST(INFOPATH)
-if test -z "$with_package_path" && test -n "$with_package_prefix" ; then
- if test "$enable_mule" = "yes" ; then
- with_package_path="~/.xemacs::${with_package_prefix}/site-packages:${with_package_prefix}/xemacs-packages:${with_package_prefix}/mule-packages"
- else
- with_package_path="~/.xemacs::${with_package_prefix}/site-packages:${with_package_prefix}/xemacs-packages"
- fi
-fi
+AC_SUBST(early_packages,$with_early_packages)
+AC_SUBST(EARLY_PACKAGE_DIRECTORIES_USER_DEFINED)
+EARLY_PACKAGE_DIRECTORIES=$with_early_packages
+while true; do
+ case "$EARLY_PACKAGE_DIRECTORIES" in
+ *\$* ) eval "EARLY_PACKAGE_DIRECTORIES=$EARLY_PACKAGE_DIRECTORIES" ;;
+ *) break ;;
+ esac
+done
+AC_SUBST(EARLY_PACKAGE_DIRECTORIES)
+
+AC_SUBST(late_packages,$with_late_packages)
+AC_SUBST(LATE_PACKAGE_DIRECTORIES_USER_DEFINED)
+LATE_PACKAGE_DIRECTORIES=$with_late_packages
+while true; do
+ case "$LATE_PACKAGE_DIRECTORIES" in
+ *\$* ) eval "LATE_PACKAGE_DIRECTORIES=$LATE_PACKAGE_DIRECTORIES" ;;
+ *) break ;;
+ esac
+done
+AC_SUBST(LATE_PACKAGE_DIRECTORIES)
+
+AC_SUBST(last_packages,$with_last_packages)
+AC_SUBST(LAST_PACKAGE_DIRECTORIES_USER_DEFINED)
+LAST_PACKAGE_DIRECTORIES=$with_last_packages
+while true; do
+ case "$LAST_PACKAGE_DIRECTORIES" in
+ *\$* ) eval "LAST_PACKAGE_DIRECTORIES=$LAST_PACKAGE_DIRECTORIES" ;;
+ *) break ;;
+ esac
+done
+AC_SUBST(LAST_PACKAGE_DIRECTORIES)
AC_SUBST(package_path,$with_package_path)
AC_SUBST(PACKAGE_PATH_USER_DEFINED)
Index: lib-src/config.values.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/config.values.in,v
retrieving revision 1.24
diff -u -r1.24 config.values.in
--- lib-src/config.values.in 11 Mar 2005 11:20:00 -0000 1.24
+++ lib-src/config.values.in 25 Nov 2005 17:37:16 -0000
＠＠ -110,6 +110,7 ＠＠
c_switch_all "＠c_switch_all＠"
c_switch_general "＠c_switch_general＠"
c_switch_window_system "＠c_switch_window_system＠"
+canna_libs "＠canna_libs＠"
configuration "＠configuration＠"
configure_input "＠configure_input＠"
datadir "＠datadir＠"
Index: lisp/package-admin.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/package-admin.el,v
retrieving revision 1.25
diff -u -r1.25 package-admin.el
--- lisp/package-admin.el 27 Dec 2004 12:25:14 -0000 1.25
+++ lisp/package-admin.el 25 Nov 2005 17:37:34 -0000
＠＠ -150,12 +150,7 ＠＠
trying to find a directory for.
Optional Argument USER-DIR if non-nil use directories off
-`user-init-directory'. This overrides everything except
-\"EMACSPACKAGEPATH\".
-
-This function honours the environment variable \"EMACSPACKAGEPATH\"
-and returns directories found there as a priority. If that variable
-doesn't exist and USER-DIR is nil, check in the normal places.
+`early-package-directories'.
If we still can't find a suitable directory, return nil.
＠＠ -164,55 +159,31 ＠＠
std == For \"standard\" packages that go in '/xemacs-packages/'
mule == For \"mule\" packages that go in '/mule-packages/'
site == For \"unsupported\" packages that go in '/site-packages/'
-
-Note: Type \"site\" is not yet fully supported."
- (let* ((env-value (getenv "EMACSPACKAGEPATH"))
+"
+ (let* ((hierarchies late-package-hierarchies)
+
+ (hierarchy-suffix
+ (file-name-as-directory
+ (cond
+ ((eq type 'std) "xemacs-packages")
+ ((eq type 'mule) "mule-packages")
+ ((eq type 'site) "site-packages"))))
+ (suffix-length (length hierarchy-suffix))
top-dir)
- ;; First, check the environment var.
- (if env-value
- (let ((path-list (paths-decode-directory-path env-value 'drop-empties)))
- (cond ((eq type 'std)
- (while path-list
- (if (equal (file-name-nondirectory
- (directory-file-name (car path-list)))
- "xemacs-packages")
- (setq top-dir (car path-list)))
- (setq path-list (cdr path-list))))
- ((eq type 'mule)
- (while path-list
- (if (equal (file-name-nondirectory
- (directory-file-name (car path-list)))
- "mule-packages")
- (setq top-dir (car path-list)))
- (setq path-list (cdr path-list)))))))
- ;; Wasn't in the environment, try `user-init-directory' if
- ;; USER-DIR is non-nil.
- (if (and user-dir
- (not top-dir))
- (cond ((eq type 'std)
- (setq top-dir (file-name-as-directory
- (expand-file-name "xemacs-packages" user-init-directory))))
- ((eq type 'mule)
- (setq top-dir (file-name-as-directory
- (expand-file-name "mule-packages" user-init-directory))))))
- ;; Finally check the normal places
- (if (not top-dir)
- (let ((path-list (nth 1 (packages-find-all-package-hierarchies
- emacs-data-roots))))
- (cond ((eq type 'std)
- (while path-list
- (if (equal (substring (car path-list) -16)
- (concat "xemacs-packages" (char-to-string directory-sep-char)))
- (setq top-dir (car path-list)))
- (setq path-list (cdr path-list))))
- ((eq type 'mule)
- (while path-list
- (if (equal (substring (car path-list) -14)
- (concat "mule-packages" (char-to-string directory-sep-char)))
- (setq top-dir (car path-list)))
- (setq path-list (cdr path-list)))))))
- ;; Now return either the directory or nil.
- top-dir))
+
+ (if user-dir
+ (expand-file-name hierarchy-suffix
+ (if configure-early-package-directories
+ (car configure-early-package-directories)
+ user-init-directory))
+
+ (while hierarchies
+ (if (string-equal (substring (car hierarchies) (- suffix-length))
+ hierarchy-suffix)
+ (setq top-dir (car hierarchies)))
+ (setq hierarchies (cdr hierarchies)))
+ top-dir)))
+
(defun package-admin-get-install-dir (package &optional pkg-dir)
"Find a suitable installation directory for a package.
Index: lisp/package-get.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/package-get.el,v
retrieving revision 1.71
diff -u -r1.71 package-get.el
--- lisp/package-get.el 24 Oct 2005 22:40:21 -0000 1.71
+++ lisp/package-get.el 25 Nov 2005 17:37:35 -0000
＠＠ -171,7 +171,16 ＠＠
;;;###autoload
(defcustom package-get-package-index-file-location
- (car (split-path (or (getenv "EMACSPACKAGEPATH") user-init-directory)))
+ (cond
+ ;; historical backage
+ ((getenv "EMACSPACKAGEPATH")
+ (split-path (getenv "EMACSPACKAGEPATH")))
+ ((getenv "EMACSEARLYPACKAGES")
+ (split-path (getenv "EMACSEARLYPACKAGES")))
+ (configure-early-package-directories
+ (car configure-early-package-directories))
+ (t
+ user-init-directory))
"*The directory where the package-index file can be found."
:type 'directory
:group 'package-get)
Index: lisp/packages.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/packages.el,v
retrieving revision 1.53
diff -u -r1.53 packages.el
--- lisp/packages.el 3 Feb 2005 23:56:53 -0000 1.53
+++ lisp/packages.el 25 Nov 2005 17:37:35 -0000
＠＠ -345,7 +345,9 ＠＠
Returns list of hierarchies."
(paths-directories-which-exist
(mapcar #'(lambda (package-directory)
- (file-name-as-directory (concat package-directory base)))
+ (file-name-as-directory
+ (concat (file-name-as-directory package-directory)
+ base)))
package-directories)))
(defun packages-split-path (path)
＠＠ -387,44 +389,67 ＠＠
(paths-uniq-append (paths-find-version-directories roots "" nil nil t)
(paths-find-site-directories roots "")))
-(defun packages-find-package-hierarchies (package-directories &optional default)
+(defun packages-find-package-hierarchies (package-directories &optional envvar default)
"Find package hierarchies in a list of package directories.
PACKAGE-DIRECTORIES is a list of package directories.
-DEFAULT is a default list of package hierarchies."
- (or default
- (let ((package-hierarchies '())
- (hierarchy-directories (packages-package-hierarchy-directory-names)))
- (while hierarchy-directories
- (setq package-hierarchies
- (nconc package-hierarchies
- (packages-find-package-hierarchies-named
- package-directories
- (car hierarchy-directories))))
- (setq hierarchy-directories (cdr hierarchy-directories)))
- package-hierarchies)))
+DEFAULT is a default list of package hierarchies.
+ENVVAR is the name of an environment variable that may override
+the default."
+ (let* ((envvar-value (and envvar (getenv envvar)))
+ (package-directories
+ (if envvar-value
+ (split-path envvar-value)
+ package-directories)))
+
+ (or (and (not envvar-value) default)
+ (let ((package-hierarchies '())
+ (hierarchy-directories (packages-package-hierarchy-directory-names)))
+ (while hierarchy-directories
+ (setq package-hierarchies
+ (nconc package-hierarchies
+ (packages-find-package-hierarchies-named
+ package-directories
+ (car hierarchy-directories))))
+ (setq hierarchy-directories (cdr hierarchy-directories)))
+ package-hierarchies))))
(defun packages-find-all-package-hierarchies (roots)
- "Find the package hierarchies.
+ "Find the package hierarchies.
ROOTS is a list of installation roots.
Returns a list of three directory lists, the first being the list of early
hierarchies, the second that of the late hierarchies, and the third the
list of the last hierarchies."
+ ;; EMACSPACKAGEPATH is a historical kludge
(let ((envvar-value (getenv "EMACSPACKAGEPATH")))
- (if envvar-value
- (packages-split-package-path (paths-decode-directory-path envvar-value))
+ (cond
+ (envvar-value
+ (packages-split-package-path (paths-decode-directory-path envvar-value)))
+ (configure-package-path
(packages-deconstruct
(packages-split-package-path configure-package-path)
- #'(lambda (configure-early-package-hierarchies
- configure-late-package-hierarchies
- configure-last-package-hierarchies)
+ #'(lambda (early late last)
(list
(packages-find-package-hierarchies (list user-init-directory)
- configure-early-package-hierarchies)
+ "EMACSEARLYPACKAGES"
+ early)
(packages-find-package-hierarchies (packages-find-installation-package-directories roots)
- configure-late-package-hierarchies)
+ "EMACSLATEPACKAGES"
+
+ late)
(packages-find-package-hierarchies '()
- configure-last-package-hierarchies)))))))
-
+ "EMACSLASTPACKAGES"
+ last)))))
+ (t
+ (list
+ (packages-find-package-hierarchies (or configure-early-package-directories
+ (list user-init-directory))
+ "EMACSEARLYPACKAGES")
+ (packages-find-package-hierarchies (or configure-late-package-directories
+ (packages-find-installation-package-directories roots))
+ "EMACSLATEPACKAGES")
+ (packages-find-package-hierarchies configure-last-package-directories
+ "EMACSLASTPACKAGES"))))))
+
(defun packages-find-package-library-path (package-hierarchies suffixes)
"Construct a path into a component of the packages hierarchy.
PACKAGE-HIERARCHIES is a list of package hierarchies.
Index: man/xemacs-faq.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/xemacs-faq.texi,v
retrieving revision 1.87
diff -u -r1.87 xemacs-faq.texi
--- man/xemacs-faq.texi 24 Oct 2005 20:39:47 -0000 1.87
+++ man/xemacs-faq.texi 25 Nov 2005 17:37:50 -0000
＠＠ -3268,7 +3268,7 ＠＠
with ＠samp{$prefix} (for example, you're a developer and are compiling
the packages yourself, and want your own private copy of everything),
you can also directly specify this using ＠file{configure}. To do this
-with 21.5 and above use the ＠samp{--with-package-prefix} parameter to
+with 21.5 and above use the ＠samp{--with-late-packages} parameter to
specify the directory under which you untarred the above tarballs.
Under 21.4 and previous you need to use ＠samp{--package-path}. Using
these options looks something like this:
＠＠ -3506,10 +3506,12 ＠＠
under ＠file{/usr/local/lib/xemacs}.
You can specify where exactly XEmacs looks for packages by using the
-＠samp{--with-package-prefix} or ＠samp{--with-package-path} parameters to
-＠file{configure} (or the equivalent settings in ＠file{config.inc}, under
-Windows), or setting the ＠samp{EMACSPACKAGEPATH} environment variable
-(which has the same format as ＠samp{--with-package-path}). ＠xref{Q2.1.1}.
+＠samp{--with-early-packages} or ＠samp{--with-late-packages} or
+＠samp{--with-last-packages} parameters to ＠file{configure} (or the
+equivalent settings in ＠file{config.inc}, under Windows), or setting the
+＠samp{EMACSEARLYPACKAGES}, ＠samp{EMACSLATEPACKAGES}, and
+＠samp{EMACSLASTPACKAGES} environment variables (which have the same format
+as the configure options). ＠xref{Q2.1.1}.
See ＠file{configure.usage} for more info about the format of these
＠file{configure} parameters.
Index: man/lispref/packaging.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/lispref/packaging.texi,v
retrieving revision 1.12
diff -u -r1.12 packaging.texi
--- man/lispref/packaging.texi 26 Sep 2005 22:19:05 -0000 1.12
+++ man/lispref/packaging.texi 25 Nov 2005 17:37:52 -0000
＠＠ -168,8 +168,10 ＠＠
results in a very ``clean'' ＠code{load-path}.
The order of search can be changed at build time by specifying the
-＠samp{--package-path} option to ＠file{configure}, or at run-time by
-specifying the ＠code{EMACSPACKAGEPATH} environment variable.
+＠samp{--with-early-packages}, ＠samp{--with-late-packages}, and
+＠samp{--with-last-packages} option to ＠file{configure}, or at run-time
+by specifying the ＠code{EMACSEARLYPACKAGES}, ＠code{EMACSLATEPACKAGES},
+＠code{EMACSLASTPACKAGES} environment variables.
＠xref{Packages,,,xemacs}.
＠c #### The following description is quite possibly inaccurate.
Index: man/xemacs/startup.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/xemacs/startup.texi,v
retrieving revision 1.10
diff -u -r1.10 startup.texi
--- man/xemacs/startup.texi 5 Feb 2003 08:18:58 -0000 1.10
+++ man/xemacs/startup.texi 25 Nov 2005 17:37:52 -0000
＠＠ -82,15 +82,13 ＠＠
hierarchy.
It is possible to specify at configure-time the location of the various
-package hierarchies with the ＠code{--package-path} option to configure.
+package directories with the ＠code{--with-early-packages},
+＠code{--with-late-packages}, and ＠code{--with-last-packages} options to
+configure.
＠cindex package path
-The early, late, and last components of the package path are separated
-by double instead of single colons. If all three components are
-present, they locate the early, late, and last package hierarchies
-respectively. If two components are present, they locate the early and
-late hierarchies. If only one component is present, it locates the
-late hierarchy. At run time, the package path may also be specified via
-the ＠code{EMACSPACKAGEPATH} environment variable.
+At run time, the package directories may also be specified via the
+＠code{EMACSEARLYPACKAGES}, ＠code{EMACSLATEPACKAGES}, and
+＠code{EMACSLASTPACKAGES} environment variables.
An XEmacs package hierarchy is laid out just like a normal installed
XEmacs directory. It may have ＠file{lisp}, ＠file{etc}, ＠file{info}, and
Index: netinstall/reginfo.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/netinstall/reginfo.h,v
retrieving revision 1.3
diff -u -r1.3 reginfo.h
--- netinstall/reginfo.h 9 Sep 2001 04:37:47 -0000 1.3
+++ netinstall/reginfo.h 25 Nov 2005 17:37:52 -0000
＠＠ -8,6 +8,9 ＠＠
#define XEMACS_INFO_XEMACS_ROOT_KEY "emacs_dir"
#define XEMACS_INFO_XEMACS_ROOT_TYPE "install_type"
#define XEMACS_INFO_XEMACS_PACKAGE_KEY "EMACSPACKAGEPATH"
+#define XEMACS_INFO_XEMACS_EARLY_PACKAGES_KEY "EMACSEARLYPACKAGES"
+#define XEMACS_INFO_XEMACS_LATE_PACKAGES_KEY "EMACSLATEPACKAGES"
+#define XEMACS_INFO_XEMACS_LAST_PACKAGES_KEY "EMACSLASTPACKAGES"
#define XEMACS_INFO_XEMACS_VERSION_KEY "version"
#define XEMACS_DEFAULT_ROOT "\\Program Files\\XEmacs"
Index: src/config.h.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/config.h.in,v
retrieving revision 1.103
diff -u -r1.103 config.h.in
--- src/config.h.in 25 Nov 2005 01:41:56 -0000 1.103
+++ src/config.h.in 25 Nov 2005 17:38:24 -0000
＠＠ -759,6 +759,9 ＠＠
#undef SITEMODULEDIR_USER_DEFINED
#undef DOCDIR_USER_DEFINED
#undef LISPDIR_USER_DEFINED
+#undef EARLY_PACKAGE_DIRECTORIES_USER_DEFINED
+#undef LATE_PACKAGE_DIRECTORIES_USER_DEFINED
+#undef LAST_PACKAGE_DIRECTORIES_USER_DEFINED
#undef PACKAGE_PATH_USER_DEFINED
#undef SITELISPDIR_USER_DEFINED
#undef ARCHLIBDIR_USER_DEFINED
Index: src/emacs.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/emacs.c,v
retrieving revision 1.161
diff -u -r1.161 emacs.c
--- src/emacs.c 25 Nov 2005 01:42:00 -0000 1.161
+++ src/emacs.c 25 Nov 2005 17:38:28 -0000
＠＠ -542,6 +542,9 ＠＠
Lisp_Object Vmodule_directory, Vconfigure_module_directory;
Lisp_Object Vsite_module_directory, Vconfigure_site_module_directory;
Lisp_Object Vconfigure_package_path;
+Lisp_Object Vconfigure_early_package_directories;
+Lisp_Object Vconfigure_late_package_directories;
+Lisp_Object Vconfigure_last_package_directories;
Lisp_Object Vdata_directory, Vconfigure_data_directory;
Lisp_Object Vdoc_directory, Vconfigure_doc_directory;
Lisp_Object Vconfigure_lock_directory;
＠＠ -4484,6 +4487,36 ＠＠
(build_ext_string (PATH_MODULESEARCH, Qfile_name));
#else
Vconfigure_module_directory = Qnil;
+#endif
+
+ DEFVAR_LISP ("configure-early-package-directories", &Vconfigure_early_package_directories /*
+For internal use by the build procedure only.
+configure's idea of what the early package directories will be.
+*/ );
+#ifdef PATH_EARLY_PACKAGE_DIRECTORIES
+ Vconfigure_early_package_directories = split_external_path (PATH_EARLY_PACKAGE_DIRECTORIES);
+#else
+ Vconfigure_early_package_directories = Qnil;
+#endif
+
+ DEFVAR_LISP ("configure-late-package-directories", &Vconfigure_late_package_directories /*
+For internal use by the build procedure only.
+configure's idea of what the late package directories will be.
+*/ );
+#ifdef PATH_LATE_PACKAGE_DIRECTORIES
+ Vconfigure_late_package_directories = split_external_path (PATH_LATE_PACKAGE_DIRECTORIES);
+#else
+ Vconfigure_late_package_directories = Qnil;
+#endif
+
+ DEFVAR_LISP ("configure-last-package-directories", &Vconfigure_last_package_directories /*
+For internal use by the build procedure only.
+configure's idea of what the last package directories will be.
+*/ );
+#ifdef PATH_LAST_PACKAGE_DIRECTORIES
+ Vconfigure_last_package_directories = split_external_path (PATH_LAST_PACKAGE_DIRECTORIES);
+#else
+ Vconfigure_last_package_directories = Qnil;
#endif
DEFVAR_LISP ("configure-package-path", &Vconfigure_package_path /*
Index: src/nt.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/nt.c,v
retrieving revision 1.47
diff -u -r1.47 nt.c
--- src/nt.c 27 Sep 2005 05:32:22 -0000 1.47
+++ src/nt.c 25 Nov 2005 17:38:29 -0000
＠＠ -443,6 +443,9 ＠＠
"EMACSDATA",
"EMACSPATH",
"EMACSPACKAGEPATH",
+ "EMACSEARLYPACKAGES",
+ "EMACSLATEPACKAGES",
+ "EMACSLASTPACKAGES",
"EMACSLOCKMETHOD",
"INFOPATH"
};
Index: src/paths.h.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/paths.h.in,v
retrieving revision 1.10
diff -u -r1.10 paths.h.in
--- src/paths.h.in 12 Apr 2001 18:24:10 -0000 1.10
+++ src/paths.h.in 25 Nov 2005 17:41:26 -0000
＠＠ -36,6 +36,10 ＠＠
PATH_MODULESEARCH The default value of `module-load-path'.
+ PATH_EARLY_PACKAGE_DIRECTORIES The value of `--with-early-packages'.
+ PATH_LATE_PACKAGE_DIRECTORIES The value of `--with-late-packages'.
+ PATH_EARLY_PACKAGE_DIRECTORIES The value of `--with-last-packages'.
+
PATH_PACKAGEPATH The default value of `package-path'.
PATH_SITE The default location of site-specific Lisp files.
＠＠ -82,6 +86,18 ＠＠
#ifdef SITEMODULEDIR_USER_DEFINED
#define PATH_SITE_MODULES "＠SITEMODULEDIR＠"
+#endif
+
+#ifdef EARLY_PACKAGE_DIRECTORIES_USER_DEFINED
+#define PATH_EARLY_PACKAGE_DIRECTORIES "＠EARLY_PACKAGE_DIRECTORIES＠"
+#endif
+
+#ifdef LATE_PACKAGE_DIRECTORIES_USER_DEFINED
+#define PATH_LATE_PACKAGE_DIRECTORIES "＠LATE_PACKAGE_DIRECTORIES＠"
+#endif
+
+#ifdef LAST_PACKAGE_DIRECTORIES_USER_DEFINED
+#define PATH_LAST_PACKAGE_DIRECTORIES "＠LAST_PACKAGE_DIRECTORIES＠"
#endif
#ifdef PACKAGE_PATH_USER_DEFINED
- 3 participants
- 9 comments
[PATCH] Better support for Russian C-x with X11
19 years
Aidan Kehoe
Aidan Kehoe
lisp/ChangeLog addition:
2005-11-27 Aidan Kehoe <kehoea(a)parhasard.net>
* x-win-xfree86.el (x-win-init-xfree86):
Initialise the hardware-specific mapping from raw keycodes to the
US key layout.
man/ChangeLog addition:
2005-11-27 Aidan Kehoe <kehoea(a)parhasard.net>
* xemacs/keystrokes.texi (Keystrokes):
Add new node on keyboards with which one can't type Latin.
* xemacs/keystrokes.texi (Non-Latin keyboards):
Describe the support for falling back to a US key layout on
keyboards where typing the Roman alphabet is difficult.
src/ChangeLog addition:
2005-11-27 Aidan Kehoe <kehoea(a)parhasard.net>
* event-Xt.c (vars_of_event_Xt):
Add two new lisp variables, x-us-keymap-description and
x-us-keymap-first-keycode to better provide a fallback to the US
layout with keyboards where typing the Roman alphabet and those
punctuation symbols that have command bindings associated with
them is difficult.
* event-Xt.c (x_event_to_emacs_event):
Use those two Lisp variables to improve Russian C-x processing.
* event-stream.c (command_builder_find_leaf):
Make a comment more readable.
XEmacs Trunk source patch:
Diff command: cvs -q diff -u
Files affected: src/event-stream.c src/event-Xt.c man/xemacs/keystrokes.texi lisp/x-win-xfree86.el
Index: lisp/x-win-xfree86.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/x-win-xfree86.el,v
retrieving revision 1.5
diff -u -u -r1.5 x-win-xfree86.el
--- lisp/x-win-xfree86.el 2001/05/04 22:42:19 1.5
+++ lisp/x-win-xfree86.el 2005/11/27 17:41:57
＠＠ -46,6 +46,41 ＠＠
;;;###autoload
(defun x-win-init-xfree86 ()
+
+ ;; We know this keyboard is an XFree86 keyboard. As such, we can predict
+ ;; what key scan codes will correspond to the keys on US keyboard layout,
+ ;; and we can use that information to fall back to the US layout when
+ ;; looking up commands that would otherwise fail. (Cf. the hard-coding of
+ ;; this information in /usr/X11R6/lib/X11/xkb/keycodes/xfree86 )
+ ;;
+ ;; These settings for x-us-keymap-first-keycode and
+ ;; x-us-keymap-description were determined with
+ ;;
+ ;; setxkbmap us
+ ;; xmodmap -pke > keyboard-description.txt
+ ;;
+ ;; "8" is the key code of the first line, x-us-keymap-description is
+ ;; taken from the column describing the bindings.
+
+ ;; We should do the same for Sun map, but XFree86 gave me an X protocol
+ ;; error when I tried to do it in software. I should pump someone with
+ ;; that hardware for the information.
+
+ (setq x-us-keymap-first-keycode 8
+ x-us-keymap-description
+ [nil nil [?1 ?!] [?2 ?＠] [?3 ?\#] [?4 ?$] [?5 ?%] [?6 ?^] [?7 ?&]
+ [?8 ?*] [?9 ?\(] [?0 ?\)] [?- ?_] [?= ?+] nil ?\t [?q ?Q]
+ [?w ?W] [?e ?E] [?r ?R] [?t ?T] [?y ?Y] [?u ?U] [?i ?I] [?o ?O]
+ [?p ?P] [?\[ ?{] [?\] ?{] nil nil [?a ?A] [?s ?S] [?d ?D]
+ [?f ?F] [?g ?G] [?h ?H] [?j ?J] [?k ?K] [?l ?L] [?\; ?:]
+ [?\' ?\"] [?\` ?~] nil [?\\ ?|] [?z ?Z] [?x ?X] [?c ?C]
+ [?v ?V] [?b ?B] [?n ?N] [?m ?M] [?\, ?<] [?\. ?>] [?/ ?\?]
+ nil ?* nil ?\ nil nil nil nil nil nil nil nil nil nil nil
+ nil nil ?7 ?8 ?9 ?- ?4 ?5 ?6 ?+ ?1 ?2 ?3 ?0 ?\. nil nil
+ [?< ?>] nil nil nil nil nil nil nil nil nil nil nil nil
+ nil nil nil nil nil ?/ nil nil nil nil nil nil nil nil
+ nil nil nil nil nil ?=])
+
(loop for (key sane-key) in
'((f13 f1)
(f14 f2)
Index: man/xemacs/keystrokes.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/xemacs/keystrokes.texi,v
retrieving revision 1.4
diff -u -u -r1.4 keystrokes.texi
--- man/xemacs/keystrokes.texi 2001/04/12 18:22:28 1.4
+++ man/xemacs/keystrokes.texi 2005/11/27 17:41:58
＠＠ -36,6 +36,7 ＠＠
* Super and Hyper Keys:: Adding modifier keys on certain keyboards.
* Character Representation:: How characters appear in Emacs buffers.
* Commands:: How commands are bound to key sequences.
+* Non-Latin keyboards:: Commands on keyboards where one can't type Latin.
＠end menu
＠node Intro to Keystrokes, Representing Keystrokes, Keystrokes, Keystrokes
＠＠ -456,7 +457,7 ＠＠
The variable ＠code{ctl-arrow} may be used to alter this behavior.
＠xref{Display Vars}.
-＠node Commands, , Character Representation, Keystrokes
+＠node Commands, Non-Latin keyboards, Character Representation, Keystrokes
＠section Keys and Commands
＠cindex binding
＠＠ -514,3 +515,38 ＠＠
are ready to be interested, read the basic information on variables, and
then the information on individual variables will make sense.
＠xref{Variables}.
+
+＠node Non-Latin keyboards, ,Commands, Keystrokes
+
+＠cindex russian
+＠cindex greek
+＠cindex ``russian c-x''
+＠cindex try-alternate-layouts-for-commands
+
+ If your computer has a keyboard designed for a language like Russian or
+Greek, where you have to go to some trouble to type Roman-alphabet
+characters, then typing ＠kbd{C-f} to call ＠code{forward-character} is
+very inconvenient.
+
+To address this, XEmacs allows you to pretend that your keyboard has a
+US layout for such commands. That is, you can type ＠kbd{C-Cyrillic_che
+C-Cyrillic_a} and XEmacs will work out that it should call the command
+that ＠kbd{C-x C-f} is bound to＠footnote{You can, of course, override
+this with an explicit binding for ＠kbd{C-Cyrillic_che C-Cyrillic_a} to
+something else.}. Function keys, like ＠key{F1},
+＠key{Shift} or ＠key{Control} are not handled by this, just alphanumeric
+characters and punctuation.
+
+The main user variable associated with this functionality is
+＠code{try-alternate-layouts-for-commands}. Setting this to ＠code{nil}
+inhibits this translation, which would be appropriate if your keyboard
+can handle the Roman alphabet but doesn't have the US layout, and you
+want to avoid the possible confusion.
+
+If ＠code{try-alternate-layouts-for-commands} is ＠code{t} but this
+functionality doesn't work for you under X11, check the value of the
+variable ＠code{x-us-keymap-description}. This is a hardware-specific
+map from key codes to the US layout, and can be initialized from the
+output of ＠code{xmodmap -pke}; see the documentation for that variable
+and for ＠code{x-us-keymap-first-keycode}.
+
Index: src/event-Xt.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/event-Xt.c,v
retrieving revision 1.89
diff -u -u -r1.89 event-Xt.c
--- src/event-Xt.c 2005/11/26 11:46:07 1.89
+++ src/event-Xt.c 2005/11/27 17:41:59
＠＠ -72,8 +72,8 ＠＠
#endif
/* For Russian C-x processing. */
-#define FIRST_ALPHABETIC_QWERTY_KEYCODE 24
-#define LAST_ALPHABETIC_QWERTY_KEYCODE 58
+Lisp_Object Vx_us_keymap_description;
+Fixnum Vx_us_keymap_first_keycode;
/* used in glyphs-x.c */
void enqueue_focus_event (Widget wants_it, Lisp_Object frame, int in_p);
＠＠ -1098,6 +1098,64 ＠＠
if (NILP (keysym))
return 0;
+ /* If we have the map from keycodes to the US layout for our
+ keyboard available, store the US layout interpretation of
+ that key in the event structure, in case a binding lookup
+ fails and we want to fall back to the US layout binding.
+
+ This _might_ be possible within an XKB framework, changing
+ the keyboard to a US XKB layout for a moment at startup,
+ storing the correspondance, and changing it back. But that
+ won't work on non-XKB servers, it makes our already slow
+ startup slower, and it's not clear that it's really any
+ easier or more maintainable than storing a correspondence in
+ Lisp. */
+
+ if (!NILP(Vx_us_keymap_description) &&
+ VECTORP(Vx_us_keymap_description) &&
+ ev->keycode >= (unsigned)Vx_us_keymap_first_keycode &&
+ ev->keycode
+ < (unsigned)XVECTOR_LENGTH(Vx_us_keymap_description))
+ {
+ Lisp_Object entr = XVECTOR_DATA(Vx_us_keymap_description)
+ [ev->keycode - Vx_us_keymap_first_keycode];
+ Ichar alternate = '\0';
+
+ if (!NILP (entr))
+ {
+ if (CHARP(entr))
+ {
+ alternate = XCHAR(entr);
+ }
+ else if (VECTORP(entr))
+ {
+ if (modifiers & XEMACS_MOD_SHIFT
+ && XVECTOR_LENGTH(Vx_us_keymap_description) > 1)
+ {
+ entr = XVECTOR_DATA(entr)[1];
+ if (CHARP(entr))
+ {
+ alternate = XCHAR(entr);
+ }
+ }
+ else if (XVECTOR_LENGTH(Vx_us_keymap_description)
+ > 0)
+ {
+ entr = XVECTOR_DATA(entr)[0];
+ if (CHARP(entr))
+ {
+ alternate = XCHAR(entr);
+ }
+ }
+ }
+ if ('\0' != alternate)
+ {
+ SET_EVENT_KEY_ALT_KEYCHARS(emacs_event, KEYCHAR_QWERTY,
+ alternate);
+ }
+ }
+ }
+
/* More Caps_Lock garbage: Caps_Lock should *only* add the
shift modifier to two-case keys (that is, A-Z and
related characters). So at this point (after looking up
＠＠ -1113,6 +1171,7 ＠＠
intermediate KeySym it used to calculate the string XEmacs
keysym. Then we can call keysym_obeys_caps_lock_p with
exactly the right argument. */
+
/* !!#### maybe fix for Mule
Hard, in the absence of a full case infrastructure for
＠＠ -1136,6 +1195,7 ＠＠
in the modifiers slot. Neither the characters "a",
"A", "2", nor "＠" normally have the shift bit set.
However, "F1" normally does. */
+
if (modifiers & XEMACS_MOD_SHIFT)
{
int Mode_switch_p = *state & xd->ModeMask;
＠＠ -1148,29 +1208,6 ＠＠
SET_EVENT_TIMESTAMP (emacs_event, ev->time);
SET_EVENT_KEY_MODIFIERS (emacs_event, modifiers);
SET_EVENT_KEY_KEYSYM (emacs_event, keysym);
-
- if (ev->keycode >= FIRST_ALPHABETIC_QWERTY_KEYCODE
- && ev->keycode <= LAST_ALPHABETIC_QWERTY_KEYCODE)
- {
- /* This correspondence isn't guaranteed by the standards, to
- my knowledge. Also, it's incomplete--doesn't include the
- upper-case characters, etc--I need to get some feedback
- on it once this is out in the world and actually being
- used by Russians. */
- static const Ascbyte qwerty_map[] =
- { 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p',
- '[', ']', '\015', '\014',
- 'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l',
- ';', '\'', '`', 0, '\\',
- 'z', 'x', 'c', 'v', 'b', 'n', 'm' };
- Ichar val = qwerty_map
- [ev->keycode - FIRST_ALPHABETIC_QWERTY_KEYCODE];
- if (val)
- {
- SET_EVENT_KEY_ALT_KEYCHARS(emacs_event, KEYCHAR_QWERTY,
- val);
- }
- }
}
else /* Mouse press/release event */
{
＠＠ -3138,6 +3175,35 ＠＠
*/ );
debug_x_events = 0;
#endif
+ DEFVAR_LISP ("x-us-keymap-description", &Vx_us_keymap_description /*
+X11-specific vector describing the current keyboard hardware, and how to map
+from its keycodes to those alphanumeric and punctuation characters that
+would be produced by it if a US layout were configured in software.
+
+We use this to make possible the usage of standard key bindings on keyboards
+where the keys that those bindings assume are not available; for example, on
+a Russian keyboard, one can type C-Cyrillic_che C-Cyrillic_a and have XEmacs
+use the binding for C-x C-f, rather than give an error message that
+C-Cyrillic_che C-Cyrillic_a is not bound.
+
+Entries are either nil, which means the corresponding key code does not map
+to a non-function key in the US layout, a single character, meaning it maps to
+that character, or a vector of two characters, the first indicating the
+unshifted mapping, the second the shifted mapping for the US layout.
+
+`x-us-keymap-first-keycode' tells XEmacs the keycode of the first entry in
+this vector.
+*/ );
+ Vx_us_keymap_description = Qnil;
+
+ DEFVAR_INT ("x-us-keymap-first-keycode", &Vx_us_keymap_first_keycode /*
+The X11 keycode that the first entry in `x-us-keymap-description'
+corresponds to. See the documentation for that variable.
+
+The X11 documentation for XDisplayKeycodes says this can never be less than
+8, but XEmacs doesn't enforce any limitation on what you set it to.
+*/ );
+ Vx_us_keymap_first_keycode = 0;
}
/* This mess is a hack that patches the shell widget to treat visual inheritance
Index: src/event-stream.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/event-stream.c,v
retrieving revision 1.92
diff -u -u -r1.92 event-stream.c
--- src/event-stream.c 2005/10/25 11:16:23 1.92
+++ src/event-stream.c 2005/11/27 17:42:02
＠＠ -3562,7 +3562,7 ＠＠
Much of that reasoning is tentative on my part, and feel free to change
this code if you have more experience with the problem and an intuition
- that differs from mine. (Aidan Kehoe, 2005-05-29)*/
+ that differs from mine. (Aidan Kehoe, 2005-05-29) */
if (!try_alternate_layouts_for_commands)
{
--
I AM IN JAIL AND ALLOWED SEND ONLY ONE CABLE SINCE WAS ARRESTED WHILE
MEASURING FIFTEEN FOOT WALL OUTSIDE PALACE AND HAVE JUST FINISHED COUNTING
THIRTY EIGHT THOUSAND FIVE HUNDERED TWENTY TWO NAMES WHOS WHO IN MIDEAST.
- 1 participants
- 2 comments
Re: [C] (packages) Bring igrep.el to 2.111
19 years
Yoichi NAKAYAMA
Yoichi NAKAYAMA
At Sat, 17 Jul 2004 17:46:20 +0200,
Michael Sperber wrote:
> 2004-07-11 Mike Sperber <mike(a)xemacs.org>
>
> * igrep.el: Synch igrep with author version 2.111.
>
> I've committed this patch.
This commit kills previous change:
> 2003-09-24 Mike Sperber <mike(a)xemacs.org>
>
> * igrep.el (igrep-find-use-xargs): Don't assume xargs behaves
> GNU-like if find does.
as igrep-find cause error on FreeBSD where xargs
doesn't have -e option.
Regards,
--
Yoichi NAKAYAMA
- 4 participants
- 6 comments
[PATCH] xemacs-21.5-clean: Another package-get.el update reflecting latest http://www.xemacs.org/Releases/ information
19 years
Adrian Aichner
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
PATCH [packages(edit-utils/power-macros)] fix to make work under SXEmacs
19 years
Zajcev Evgeny
Zajcev Evgeny
Use of (boundp 'xemacs-logo) form causes problems to SXEmacs (
'xemacs-logo is unbound in SXEmacs) -- (featurep 'xemacs) is safer ..
-----
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/edit-utils/ChangeLog,v
retrieving revision 1.214
diff -u -p -r1.214 ChangeLog
--- ChangeLog 2005/11/25 08:15:15 1.214
+++ ChangeLog 2005/11/28 20:29:02
＠＠ -1,3 +1,8 ＠＠
+2005-11-28 Zajcev Evgeny <zevlg(a)yandex.ru>
+
+ * power-macros.el: Use (featurep 'xemacs) instead of (boundp
+ 'xemacs-logo)
+
2005-11-25 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 2.31 released.
Index: power-macros.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/edit-utils/power-macros.el,v
retrieving revision 1.1
diff -u -p -r1.1 power-macros.el
--- power-macros.el 2000/10/18 17:54:30 1.1
+++ power-macros.el 2005/11/28 20:29:03
＠＠ -226,10 +226,10 ＠＠ be accurate) by pressing \\[pm-define]."
; Make the compiler shut up under GNU-Emacs:
(eval-when-compile
- (or (boundp 'xemacs-logo)
+ (or (featurep 'xemacs)
(boundp 'event-closest-point)
(defun event-closest-point (dummy) 'dummy))
- (or (boundp 'xemacs-logo)
+ (or (featurep 'xemacs)
(boundp 'events-to-keys)
(defun events-to-keys(dummy) 'dummy))
)
＠＠ -537,7 +537,7 ＠＠ In this buffer you have the following po
(add-text-properties p2 (point) '(mouse-face highlight))
;;---------- End of tuple
- (if (not (boundp 'xemacs-logo))
+ (if (not (featurep 'xemacs))
(insert "\n"))
(push (list tuple-physical-start tuple-logical-start (point)
＠＠ -564,7 +564,7 ＠＠ In this buffer you have the following po
(define-key pm-normal-edit-map [(control c) (control c)]
(lambda () (interactive) (kill-buffer (current-buffer))))
(define-key pm-normal-edit-map [(return)] 'pm-edit-field-return)
- (if (boundp 'xemacs-logo)
+ (if (featurep 'xemacs)
(define-key pm-normal-edit-map [(button1)] 'pm-edit-field-mouse)
(define-key pm-normal-edit-map [(mouse-1)] 'pm-edit-field-mouse))
(define-key pm-normal-edit-map [(d)] 'pm-set-delete-mark)
＠＠ -653,7 +653,7 ＠＠ type."
(defun pm-edit-field-mouse (event)
"See the description for `pm-edit-field'."
(interactive "e")
- (if (boundp 'xemacs-logo)
+ (if (featurep 'xemacs)
(goto-char (event-closest-point event)))
(pm-edit-field t))
＠＠ -855,7 +855,7 ＠＠ field in the manage buffer."
(define-key keym [(control g)]
(lambda () (interactive)
(pm-end-edit-or-abort-desc-field 'abort)))
- (if (boundp 'xemacs-logo)
+ (if (featurep 'xemacs)
(add-text-properties start end `(keymap ,keym))
(add-text-properties start end `(local-map ,keym))))
＠＠ -1920,7 +1920,7 ＠＠ The buffer is created if it doesn't exis
(defun pm-read-key-sequence (question)
"Reads a key sequence."
(let ((key (read-key-sequence question nil t)))
- (if (boundp 'xemacs-logo)
+ (if (featurep 'xemacs)
(events-to-keys key)
key)))
-----
Thanks!
--
lg
- 2 participants
- 1 comments
Re: [AC21.5] Implicit INLINE_HEADERS in modules don't get instantiated
19 years
Rick Rankin
Rick Rankin
--- "Stephen J. Turnbull" <stephen(a)xemacs.org> wrote:
> APPROVE COMMIT 21.5
>
> Per recommendation of Ben. This is not meant to block Marcus's
> "xemacs.def.in in modules" patch, but it does work for Mac OS X.
>
> This seems to have snuck in with the Xft merge commit. Sorry!
>
> 2005-11-07 Stephen J. Turnbull <stephen(a)xemacs.org>
>
> * inline.c: Include modules headers regardless of HAVE_SHLIB.
>
> Reproducing the patch (which was originally sent to xemacs-beta for
> discussion).
>
> In the lrecord code, if error checking is turned on, each Lisp object
> type automatically gets a error_check_TYPE_name function defined using
> DECLARE_INLINE_HEADER. For reasons I don't understand well at all, at
> least on Mac OS X 10.3.9 with GCC 3.3 these functions don't get
> instantiated for the PostgreSQL and LDAP modules.
>
> The patch below wins for me, but it's not very pleasant as it seems to
> imply it's not possible to get an error-checking build outside of the
> XEmacs tree.
>
> Comments appreciated.
>
> diff -rN -u old-xft-integration-new/src/inline.c
new-xft-integration-new/src/inline.c
> --- old-xft-integration-new/src/inline.c 2005-11-05 00:45:16.000000000 +0900
> +++ new-xft-integration-new/src/inline.c 2005-11-05 00:45:24.000000000 +0900
> ＠＠ -67,11 +67,13 ＠＠
> #include "syntax.h"
> #include "window.h"
>
> -#if defined (HAVE_LDAP) && !defined (HAVE_SHLIB)
> +/* if we demand !define (HAVE_SHLIB) the inlines don't get instantiated */
> +#if defined (HAVE_LDAP)
> #include "../modules/ldap/eldap.h"
> #endif
>
> -#if defined (HAVE_POSTGRESQL) && !defined (HAVE_SHLIB)
> +/* if we demand !define (HAVE_SHLIB) the inlines don't get instantiated */
> +#if defined (HAVE_POSTGRESQL)
> #include "../modules/postgresql/postgresql.h"
> #endif
>
When I turn on error checking and build on Cygwin with this patch applied, I
(still) get lots of unresolved externals in the modules, mostly functions named
error_check_*. I've added those symbols xemacs.def.in.in and generated a new
patch. With the modified xemacs.def.in.in, I'm able to build on Cygwin with
both error checking enabled and disabled.
I have no idea whether or not this is the right thing to do, but it works for
Cygwin.
--Rick
Index: src/xemacs.def.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/xemacs.def.in.in,v
retrieving revision 1.11
diff -u -r1.11 xemacs.def.in.in
--- src/xemacs.def.in.in 2005/11/28 16:39:54 1.11
+++ src/xemacs.def.in.in 2005/11/29 04:06:01
＠＠ -82,6 +82,12 ＠＠
eputenv
#ifdef DEBUG_XEMACS
eq_with_ebola_notice /* EQ_WITH_EBOLA_NOTICE */
+error_check_cons
+error_check_ldap
+error_check_opaque_ptr
+error_check_pgconn
+error_check_pgresult
+error_check_string
#endif
free_opaque_ptr
get_coding_system_for_text_file
＠＠ -144,6 +150,9 ＠＠
vector2
vector3
warn_when_safe
+#ifdef DEBUG_XEMACS
+wrap_record_1
+#endif
write_c_string
write_fmt_string
write_fmt_string_lisp
＠＠ -187,6 +196,9 ＠＠
Fsignal
Fthrow
Fvector
+#ifdef DEBUG_XEMACS
+XINT_1
+#endif
/* Exported variables */
__temp_alloca_size__ /* ALLOCA */
- 3 participants
- 4 comments
[PATCH] Xft related configure option fixes.
19 years
Malcolm Purvis
Malcolm Purvis
It looks like Robert's problems with --with-xft haven't been a result of
recent changes to XE_PARSE_COMPLEX_OPTION but because of a long standing bug
that only manifests itself when the defaults for complex values are
non-blank. This patch should fix this and get xft to work again.
The specifications for complex arguments have evolved over the last few months
and are not well documented. Therefore below are various combinations that
the patch supports. Stephen, is this the behaviour that you expect? Can you
also check that I haven't broken the other complex arguments?
Given a complex option --with-complex with three values: 'foo', 'bar' and
'baz' that have defaults of 'yes', 'no' and "" the shell variables under
different conditions are:
1) --with-complex not supplied:
with_complex_foo=""
with_complex_bar=""
with_complex_baz=""
2) --with-complex
with_complex_foo=yes
with_complex_bar=no
with_complex_baz=""
3) --without-complex
with_complex_foo=no
with_complex_bar=no
with_complex_baz=no
4) --with-complex=bar
with_complex_foo=no
with_complex_bar=yes
with_complex_baz=no
5) --with-complex=all
with_complex_foo=yes
with_complex_bar=yes
with_complex_baz=yes
6) --with-complex=none,bar
with_complex_foo=no
with_complex_bar=yes
with_complex_baz=no
7) --with-complex=all,nofoo
with_complex_foo=no
with_complex_bar=yes
with_complex_baz=yes
ChangeLog addition:
2005-11-29 Malcolm Purvis <malcolmp(a)xemacs.org>
* configure.ac (XE_PARSE_COMPLEX_OPTION): Correctly handle
--with-FOO[=yes]. Only enable defaults when the arg is
specified.
* configure.ac (XE_COMPLEX_ARG[xft]): Default everything on;
change doc.
xemacs-autoconf-2.5 source patch:
Diff command: cvs -q diff -u
Files affected: configure.ac configure
Index: configure.ac
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v
retrieving revision 1.26
diff -u -r1.26 configure.ac
--- configure.ac 2005/11/28 09:50:20 1.26
+++ configure.ac 2005/11/29 12:51:51
＠＠ -368,8 +368,7 ＠＠
dnl value and to note the values in an option list.
dnl
define([XE_EXPAND_COMPLEX_OPTION],
-[with_[$1]_[$2]=[$3]
-enable_[$1]_[$2]=[$3]
+[_[$1]_[$2]_default=[$3]
m4_append([XE_COMPONENT_LIST],[$2],[ ])dnl
dnl Separate with a ':' instead of a ',' (see <prefix>_default below) to avoid
dnl confusion with marco parameter lists.
＠＠ -413,7 +412,7 ＠＠
dnl Internal macro to parse the option values. If an undeclared option is
dnl found then an error is generated. Because something has been supplied on
dnl the command line initialise all the complex options to 'no' rather than
-dnl the default. In thius way --enable-complex=foo will give the expected
+dnl the default. In this way --enable-complex=foo will give the expected
dnl value (no) for bar.
dnl
define([XE_PARSE_COMPLEX_OPTION],
＠＠ -423,13 +422,20 ＠＠
done
for x in `echo "$with_[$1]" | sed -e 's/,/ /g'` ; do
_[$1]_all_default=""
+ _[$1]_use_default=""
_[$1]_found=""
case "$x" in
n | no | non | none ) _[$1]_all_default=no ;;
a | al | all | both ) _[$1]_all_default=yes ;;
+ y | yes ) _[$1]_use_default=yes ;;
esac
- if test -z "$_[$1]_all_default"; then
+ if test -n "$_[$1]_use_default"; then
+ for y in $_[$1]_types; do
+ eval "with_[$1]_$y=\$_[$1]_${y}_default"
+ eval "enable_[$1]_$y=\$_[$1]_${y}_default"
+ done
+ elif test -z "$_[$1]_all_default"; then
for y in $_[$1]_types; do
dnl echo "testing x='$x' against y='$y'"
if test "$x" = "$y"; then
＠＠ -449,11 +455,12 ＠＠
test -z "$_[$1]_found" && _[$1]_bogus=yes
fi
if test "$_[$1]_bogus" = "yes" -o \
- \( -n "$_[$1]_all_default" -a -n "$_[$1]_notfirst" \) ; then
- USAGE_ERROR(["Valid values for the [$2] option are:
-$_[$1]_types. With prefix \"no\", switch it off.
-Defaults may be overridden with \`all' or \`none' first in the list.
-Hardcoded default is: $_[$1]_default."])
+ \( \( -n "$_[$1]_all_default" -o -n "$_[$1]_use_default" \) -a -n "$_[$1]_notfirst" \) ; then
+ USAGE_ERROR(["Invalid option supplied. Valid values for the [$2] option are:
+ $_[$1]_types.
+ A prefix of \"no\" will turn an option off. Options not given are set to off.
+ Without an argument the default is $_[$1]_default.
+ If the first option is \`all' or \`none' then all options are turned on or off."])
elif test -n "$_[$1]_all_default" ; then
for y in $_[$1]_types; do
eval "with_[$1]_$y=$_[$1]_all_default"
＠＠ -637,12 +644,12 ＠＠
[Xft],
[`emacs' (buffers), `menubars', `tabs', and `gauges'],
[X11, Xft, Xrender, freetype, and fontconfig],
- [`noemacs, nomenubars, notabs, nogauges'])],
+ [`emacs, menubars, tabs, gauges'])],
[],[],
- [XE_COMPLEX_OPTION([emacs],[no]),
- XE_COMPLEX_OPTION([menubars],[no]),
- XE_COMPLEX_OPTION([tabs],[no]),
- XE_COMPLEX_OPTION([gauges],[no])])
+ [XE_COMPLEX_OPTION([emacs],[yes]),
+ XE_COMPLEX_OPTION([menubars],[yes]),
+ XE_COMPLEX_OPTION([tabs],[yes]),
+ XE_COMPLEX_OPTION([gauges],[yes])])
XE_MERGED_ARG([gtk],
AC_HELP_STRING([--with-gtk],[Support GTK on the X Window System. (EXPERIMENTAL)]),
[true], [with_gtk=no])
--
Malcolm Purvis <malcolmp(a)xemacs.org>
- 2 participants
- 2 comments
Re: [PATCH] repair xemacs.def.in.in
19 years
Marcus Crestani
Marcus Crestani
>>>>>"MC" == Marcus Crestani <crestani(a)informatik.uni-tuebingen.de> writes:
MC> +#ifdef HAVA_LDAP
This is a typo, it should read HAVE_LDAP.
--
Marcus
- 1 participants
- 0 comments