[AC 21.5]
15 years, 5 months
Stephen J. Turnbull
APPROVE COMMIT 21.5
This patch contains non-ASCII characters. Be careful in applying it
from mail!
diff -r 5e8f6469169f -r e0a8c796f955 tests/ChangeLog
--- a/tests/ChangeLog Sat Sep 27 16:34:40 2008 +0900
+++ b/tests/ChangeLog Sat Sep 27 16:38:11 2008 +0900
＠＠ -1,3 +1,7 ＠＠
+2008-09-27 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * automated/regexp-tests.el: Add test for at_dot regexp.
+
2008-09-27 Stephen J. Turnbull <stephen(a)xemacs.org>
* automated/regexp-tests.el: `with-string-as-buffer-contents'
diff -r 5e8f6469169f -r e0a8c796f955 tests/automated/regexp-tests.el
--- a/tests/automated/regexp-tests.el Sat Sep 27 16:34:40 2008 +0900
+++ b/tests/automated/regexp-tests.el Sat Sep 27 16:38:11 2008 +0900
＠＠ -545,3 +545,21 ＠＠
;; via `replace-regexp-in-string', but we should specifically test bogus
;; combinations of STRING and STRBUFFER.
+;; empty string at point
+;; Thanks Julian Bradford on XEmacs Beta
+;; <18652.54975.894512.880956(a)krk.inf.ed.ac.uk>
+(with-string-as-buffer-contents "aáa"
+ (goto-char (point-min))
+ (Assert (looking-at "\\="))
+ (Assert (= (re-search-forward "\\=") 1))
+ (forward-char 1)
+ (Assert (looking-at "\\="))
+ (Assert (= (re-search-forward "\\=") 2))
+ (forward-char 1)
+ (Assert (looking-at "\\="))
+ (Assert (= (re-search-forward "\\=") 3))
+ (forward-char 1)
+ (Assert (looking-at "\\="))
+ (Assert (= (re-search-forward "\\=") 4)))
+
+
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
commit: Fix typo in XtSetValues in xm_update_progress().
15 years, 5 months
Stephen Turnbull
changeset: 4515:bbce7f6de2d61e0c1852d90d99b94cefb9bd53d2
tag: tip
user: Stephen J. Turnbull <stephen(a)xemacs.org>
date: Sun Oct 26 21:26:42 2008 +0900
files: lwlib/lwlib-Xm.c
description:
Fix typo in XtSetValues in xm_update_progress().
diff -r e8a9d6a10efaa16af0cbfed0f6a0b9065f789eef -r bbce7f6de2d61e0c1852d90d99b94cefb9bd53d2 lwlib/lwlib-Xm.c
--- a/lwlib/lwlib-Xm.c Sat Oct 25 21:52:48 2008 +0900
+++ b/lwlib/lwlib-Xm.c Sun Oct 26 21:26:42 2008 +0900
＠＠ -377,7 +377,7 ＠＠ xm_update_progress (widget_instance* UNU
XtSetArg (al [ac], XmNscaleWidth, width); ac++;
}
- XtSetValues (scale, al, 1);
+ XtSetValues (scale, al, ac);
}
#endif /* LWLIB_WIDGETS_MOTIF */
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
commit: Merge in pkg-docs. Fix up ChangeLog.
15 years, 5 months
Stephen Turnbull
changeset: 4514:e8a9d6a10efaa16af0cbfed0f6a0b9065f789eef
parent: 4512:66411359ce4eec5b18a399cc00452e8098a7c810
parent: 4513:51fa2a054060f3885f1d7979036cf4867f403ba3
user: Stephen J. Turnbull <stephen(a)xemacs.org>
date: Sat Oct 25 21:52:48 2008 +0900
files: ChangeLog
description:
Merge in pkg-docs. Fix up ChangeLog.
diff -r 66411359ce4eec5b18a399cc00452e8098a7c810 -r e8a9d6a10efaa16af0cbfed0f6a0b9065f789eef ChangeLog
--- a/ChangeLog Sat Oct 25 21:40:46 2008 +0900
+++ b/ChangeLog Sat Oct 25 21:52:48 2008 +0900
＠＠ -1,3 +1,7 ＠＠ 2008-10-25 Stephen J. Turnbull <stephe
+2008-10-25 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * INSTALL: Give better pointers to package documentation.
+
2008-10-25 Stephen J. Turnbull <stephen(a)xemacs.org>
* configure.ac (xemacs_cc_cc_mismatch): Improve g++ detection.
diff -r 66411359ce4eec5b18a399cc00452e8098a7c810 -r e8a9d6a10efaa16af0cbfed0f6a0b9065f789eef INSTALL
--- a/INSTALL Sat Oct 25 21:40:46 2008 +0900
+++ b/INSTALL Sat Oct 25 21:52:48 2008 +0900
＠＠ -1,7 +1,7 ＠＠ XEmacs Installation Guide
XEmacs Installation Guide
Copyright (c) 1994, 1995, 1996 Board of Trustees, University of Illinois
-Copyright (c) 1994-1999, 2003 Free Software Foundation, Inc.
+Copyright (c) 1994-1999, 2003, 2008 Free Software Foundation, Inc.
Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the
＠＠ -61,11 +61,13 ＠＠ PACKAGE SYSTEM
PACKAGE SYSTEM
==============
-The file README.packages contain information vital to have a fully
+The FAQ sections 1.7 and 2.1 contain information vital to have a fully
working XEmacs. It includes a description of available packages, and
how to bootstrap XEmacs from a minimal or a complete set of packages.
This information was not included in this file only because it is too
-large for this terse INSTALL. Please read README.packages now!
+large for this terse INSTALL. The FAQ is available in Texinfo format
+in man/xemacs-faq.texi, as an Info file once you build XEmacs, and
+online at http://www.xemacs.org/Documentation/21.5/html/xemacs-faq_1.html.
ADD-ON LIBRARIES
================
＠＠ -794,8 +796,8 ＠＠ remove the files that `configure' create
remove the files that `configure' created (so you can compile XEmacs
for a different configuration), type `make distclean'.
-READ README.packages
-====================
+READ THE FAQ
+============
Do it!
＠＠ -803,8 +805,8 ＠＠ PROBLEMS
========
The most common problem is that you forgot to read and follow the
-directions in README.packages. You can not have a normal XEmacs
-without downloading some additional packages.
+directions for installing bootstrap packages in the FAQ. You can not
+have a normal XEmacs without downloading some additional packages.
See the file PROBLEMS in this directory for a list of various problems
sometimes encountered, and what to do about them. PROBLEMS is also
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
commit: Give better pointers to package documentation.
15 years, 5 months
Stephen Turnbull
changeset: 4513:51fa2a054060f3885f1d7979036cf4867f403ba3
parent: 4508:742a23369b74e442741e2c333da6fab80854093a
user: Stephen J. Turnbull <stephen(a)xemacs.org>
date: Sat Oct 25 21:48:33 2008 +0900
files: ChangeLog
description:
Give better pointers to package documentation.
diff -r 742a23369b74e442741e2c333da6fab80854093a -r 51fa2a054060f3885f1d7979036cf4867f403ba3 ChangeLog
--- a/ChangeLog Sat Aug 02 02:43:19 2008 -0700
+++ b/ChangeLog Sat Oct 25 21:48:33 2008 +0900
＠＠ -1,3 +1,7 ＠＠ 2008-07-06 Ville Skyttä <scop(a)xemacs.o
+2008-10-25 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * INSTALL: Give better pointers to package documentation.
+
2008-07-06 Ville Skyttä <scop(a)xemacs.org>
* configure.ac (xe_fst):
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
commit: Merge in ac-fix-2008-10-25. Fix up ChangeLogs.
15 years, 5 months
Stephen Turnbull
changeset: 4512:66411359ce4eec5b18a399cc00452e8098a7c810
parent: 4509:dd12adb12b8f72dd2fd2b9effb97cde3277ce750
parent: 4511:71bf2c5667ba4dfece70c13c5f9fd249474f3652
user: Stephen J. Turnbull <stephen(a)xemacs.org>
date: Sat Oct 25 21:40:46 2008 +0900
files: ChangeLog configure.ac src/ChangeLog src/lisp.h
description:
Merge in ac-fix-2008-10-25. Fix up ChangeLogs.
diff -r dd12adb12b8f72dd2fd2b9effb97cde3277ce750 -r 66411359ce4eec5b18a399cc00452e8098a7c810 ChangeLog
--- a/ChangeLog Sat Oct 04 13:57:55 2008 +0900
+++ b/ChangeLog Sat Oct 25 21:40:46 2008 +0900
＠＠ -1,3 +1,7 ＠＠ 2008-08-03 Mats Lidell <matsl(a)xemacs.o
+2008-10-25 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * configure.ac (xemacs_cc_cc_mismatch): Improve g++ detection.
+
2008-08-03 Mats Lidell <matsl(a)xemacs.org>
* configure.ac: Fix typo xft_gauge to xft_gauges
diff -r dd12adb12b8f72dd2fd2b9effb97cde3277ce750 -r 66411359ce4eec5b18a399cc00452e8098a7c810 configure.ac
--- a/configure.ac Sat Oct 04 13:57:55 2008 +0900
+++ b/configure.ac Sat Oct 25 21:40:46 2008 +0900
＠＠ -2239,18 +2239,25 ＠＠ fi
dnl If we're specifying XEMACS_CC, it'd better be in the same family
dnl as CC or the following flag calculations are bogus.
-dnl #### We may want to actually error and abort here, but I am not sure.
+dnl No error/abort; detection is too fragile.
+
+xemacs_cc_cc_mismatch=no
if test "$CC" != "$XEMACS_CC"; then
- if test "$XEMACS_CC" = "g++" -a "$GCC" != "yes"; then
- AC_MSG_WARN([CC and g++ are mismatched; XE_CFLAGS may be wrong])
- xemacs_cc_cc_mismatch=yes
- elif test -n "$GCC" -a "$XEMACS_CC" != "g++"; then
- AC_MSG_WARN([gcc and XEMACS_CC are mismatched; XE_CFLAGS may be wrong])
- xemacs_cc_cc_mismatch=yes
+ case "$XEMACS_CC" in
+ *g++* )
+ if test "$GCC" != "yes"; then
+ AC_MSG_WARN([CC and g++ are mismatched; XE_CFLAGS may be wrong])
+ xemacs_cc_cc_mismatch=yes ;;
+ esac
+ if test -n "$GCC"; then
+ case $XEMACS_CC in
+ *g++* )
+ ;;
+ * )
+ AC_MSG_WARN([gcc and XEMACS_CC are mismatched; XE_CFLAGS may be wrong])
+ xemacs_cc_cc_mismatch=yes ;;
+ esac
dnl #### Add other detectable mismatches here.
- else
- xemacs_cc_cc_mismatch=no
- fi
fi
dnl Calculate optimization flags. These will be off by default in beta
diff -r dd12adb12b8f72dd2fd2b9effb97cde3277ce750 -r 66411359ce4eec5b18a399cc00452e8098a7c810 src/ChangeLog
--- a/src/ChangeLog Sat Oct 04 13:57:55 2008 +0900
+++ b/src/ChangeLog Sat Oct 25 21:40:46 2008 +0900
＠＠ -1,3 +1,10 ＠＠ 2008-08-27 Aidan Kehoe <kehoea＠parhasa
+2008-10-25 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * lisp.h (static_pro): Cast out a warning.
+ g++ 4.3 complains about the conversion of const char to char.
+ These end up in a dynarray, so we would need to define a whole new
+ class of dynarray just to handle the const char stuff.
+
2008-08-27 Aidan Kehoe <kehoea(a)parhasard.net>
* symbols.c (Fuser_variable_p):
diff -r dd12adb12b8f72dd2fd2b9effb97cde3277ce750 -r 66411359ce4eec5b18a399cc00452e8098a7c810 src/lisp.h
--- a/src/lisp.h Sat Oct 04 13:57:55 2008 +0900
+++ b/src/lisp.h Sat Oct 25 21:40:46 2008 +0900
＠＠ -3815,12 +3815,16 ＠＠ extern Lisp_Object_ptr_dynarr *staticpro
MODULE_API void staticpro_1 (Lisp_Object *, Ascbyte *);
MODULE_API void staticpro_nodump_1 (Lisp_Object *, Ascbyte *);
-#define staticpro(ptr) staticpro_1 (ptr, #ptr)
-#define staticpro_nodump(ptr) staticpro_nodump_1 (ptr, #ptr)
+/* g++ 4.3 complains about the conversion of const char to char.
+ These end up in a dynarray, so we would need to define a whole new class
+ of dynarray just to handle the const char stuff.
+ ####Check to see how hard this might be. */
+#define staticpro(ptr) staticpro_1 (ptr, (Ascbyte *) #ptr)
+#define staticpro_nodump(ptr) staticpro_nodump_1 (ptr, (Ascbyte *) #ptr)
#ifdef HAVE_SHLIB
MODULE_API void unstaticpro_nodump_1 (Lisp_Object *, Ascbyte *);
-#define unstaticpro_nodump(ptr) unstaticpro_nodump_1 (ptr, #ptr)
+#define unstaticpro_nodump(ptr) unstaticpro_nodump_1 (ptr, (Ascbyte *) #ptr)
#endif
#else
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
commit: Fix g++ const char -> char warnings.
15 years, 5 months
Stephen Turnbull
changeset: 4511:71bf2c5667ba4dfece70c13c5f9fd249474f3652
user: Stephen J. Turnbull <stephen(a)xemacs.org>
date: Sat Oct 25 20:35:36 2008 +0900
files: src/lisp.h
description:
Fix g++ const char -> char warnings.
diff -r bd1fbed783dd4440c1eec52e61492f4253c32c50 -r 71bf2c5667ba4dfece70c13c5f9fd249474f3652 src/lisp.h
--- a/src/lisp.h Sat Oct 25 18:59:03 2008 +0900
+++ b/src/lisp.h Sat Oct 25 20:35:36 2008 +0900
＠＠ -3799,12 +3799,16 ＠＠ extern Lisp_Object_ptr_dynarr *staticpro
MODULE_API void staticpro_1 (Lisp_Object *, Ascbyte *);
MODULE_API void staticpro_nodump_1 (Lisp_Object *, Ascbyte *);
-#define staticpro(ptr) staticpro_1 (ptr, #ptr)
-#define staticpro_nodump(ptr) staticpro_nodump_1 (ptr, #ptr)
+/* g++ 4.3 complains about the conversion of const char to char.
+ These end up in a dynarray, so we would need to define a whole new class
+ of dynarray just to handle the const char stuff.
+ ####Check to see how hard this might be. */
+#define staticpro(ptr) staticpro_1 (ptr, (Ascbyte *) #ptr)
+#define staticpro_nodump(ptr) staticpro_nodump_1 (ptr, (Ascbyte *) #ptr)
#ifdef HAVE_SHLIB
MODULE_API void unstaticpro_nodump_1 (Lisp_Object *, Ascbyte *);
-#define unstaticpro_nodump(ptr) unstaticpro_nodump_1 (ptr, #ptr)
+#define unstaticpro_nodump(ptr) unstaticpro_nodump_1 (ptr, (Ascbyte *) #ptr)
#endif
#else
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
commit: Improve g++ detection.
15 years, 5 months
Stephen Turnbull
changeset: 4510:bd1fbed783dd4440c1eec52e61492f4253c32c50
parent: 3975:1af222c7586991f690ea06d1b8c75fb5a6a0a352
user: Stephen J. Turnbull <stephen(a)xemacs.org>
date: Sat Oct 25 18:59:03 2008 +0900
files: ChangeLog configure.ac
description:
Improve g++ detection.
diff -r 1af222c7586991f690ea06d1b8c75fb5a6a0a352 -r bd1fbed783dd4440c1eec52e61492f4253c32c50 ChangeLog
--- a/ChangeLog Mon May 21 05:02:43 2007 +0000
+++ b/ChangeLog Sat Oct 25 18:59:03 2008 +0900
＠＠ -1,3 +1,7 ＠＠ 2007-05-21 Stephen J. Turnbull <stephe
+2008-10-25 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * configure.ac (xemacs_cc_cc_mismatch): Improve g++ detection.
+
2007-05-21 Stephen J. Turnbull <stephen(a)xemacs.org>
* XEmacs 21.5.28 "fuki" is released.
diff -r 1af222c7586991f690ea06d1b8c75fb5a6a0a352 -r bd1fbed783dd4440c1eec52e61492f4253c32c50 configure.ac
--- a/configure.ac Mon May 21 05:02:43 2007 +0000
+++ b/configure.ac Sat Oct 25 18:59:03 2008 +0900
＠＠ -2236,18 +2236,25 ＠＠ fi
dnl If we're specifying XEMACS_CC, it'd better be in the same family
dnl as CC or the following flag calculations are bogus.
-dnl #### We may want to actually error and abort here, but I am not sure.
+dnl No error/abort; detection is too fragile.
+
+xemacs_cc_cc_mismatch=no
if test "$CC" != "$XEMACS_CC"; then
- if test "$XEMACS_CC" = "g++" -a "$GCC" != "yes"; then
- AC_MSG_WARN([CC and g++ are mismatched; XE_CFLAGS may be wrong])
- xemacs_cc_cc_mismatch=yes
- elif test -n "$GCC" -a "$XEMACS_CC" != "g++"; then
- AC_MSG_WARN([gcc and XEMACS_CC are mismatched; XE_CFLAGS may be wrong])
- xemacs_cc_cc_mismatch=yes
+ case "$XEMACS_CC" in
+ *g++* )
+ if test "$GCC" != "yes"; then
+ AC_MSG_WARN([CC and g++ are mismatched; XE_CFLAGS may be wrong])
+ xemacs_cc_cc_mismatch=yes ;;
+ esac
+ if test -n "$GCC"; then
+ case $XEMACS_CC in
+ *g++* )
+ ;;
+ * )
+ AC_MSG_WARN([gcc and XEMACS_CC are mismatched; XE_CFLAGS may be wrong])
+ xemacs_cc_cc_mismatch=yes ;;
+ esac
dnl #### Add other detectable mismatches here.
- else
- xemacs_cc_cc_mismatch=no
- fi
fi
dnl Calculate optimization flags. These will be off by default in beta
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
commit: Fix broken Xft FAQ.
15 years, 5 months
Stephen Turnbull
changeset: 4509:dd12adb12b8f72dd2fd2b9effb97cde3277ce750
parent: 4507:83e35df20028429b49acb60906054e176629b1f0
user: Stephen J. Turnbull <stephen(a)xemacs.org>
date: Sat Oct 04 13:57:55 2008 +0900
files: man/ChangeLog man/xemacs-faq.texi
description:
Fix broken Xft FAQ.
diff -r 83e35df20028429b49acb60906054e176629b1f0 -r dd12adb12b8f72dd2fd2b9effb97cde3277ce750 man/ChangeLog
--- a/man/ChangeLog Mon Sep 08 08:48:22 2008 +0200
+++ b/man/ChangeLog Sat Oct 04 13:57:55 2008 +0900
＠＠ -1,3 +1,8 ＠＠ 2008-08-31 Aidan Kehoe <kehoea＠parhasa
+2008-10-04 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * xemacs-faq.texi (Q5.0.7): Fix broken instructions on use of
+ antialiased fonts.
+
2008-08-31 Aidan Kehoe <kehoea(a)parhasard.net>
* xemacs-faq.texi (Q5.0.7): Add a section on how one can use
diff -r 83e35df20028429b49acb60906054e176629b1f0 -r dd12adb12b8f72dd2fd2b9effb97cde3277ce750 man/xemacs-faq.texi
--- a/man/xemacs-faq.texi Mon Sep 08 08:48:22 2008 +0200
+++ b/man/xemacs-faq.texi Sat Oct 04 13:57:55 2008 +0900
＠＠ -6284,41 +6284,53 ＠＠ bugs...
＠node Q5.0.7, Q5.1.1, Q5.0.6, External Subsystems
＠unnumberedsubsec Q5.0.7: How can I use antialiased fonts under X11?
-For this you need a recent beta version, and please consider the caveats
-that apply when using beta software from any source. Rebuild xemacs
-using at least the following options to configure:
-
-(a)samp{./configure --enable-mule --with-xft=emacs,menubars}
-
-For further details on the XEmacs widgets that support XFT, see the
-output of ＠code{./configure --help}. You may find that you have to
-install some lib[something]-dev packages to provide header files; see
-your packaging system's documentation. Depending on your platform, your
-packaging system will normally be something like RPM, ＠code{apt} or
-DarwinPorts.
+The X11 version of XEmacs can use antialiased fonts via the Xft,
+fontconfig, and freetype libraries. To configure this you need a recent
+beta version (at least 21.5.24); the more recent, the better. This is
+beta software, the usual caveats apply. Rebuild xemacs using the
+following configure options, plus any others you normally use:
+
+＠samp{--enable-mule --with-xft=emacs,menubars}
+
+Xft ＠emph{may} work without Mule but the developers working on the Xft
+code invariably build with Mule. The tab control also supports Xft, and
+at some date the progress gauge will as well. If they are configured in
+to XEmacs, you may add ＠samp{tabs} and ＠samp{gauges} to the value of the
+＠samp{--with-xft} option (with a comma separating each value from the
+previous ones). For further details on the XEmacs widgets that support
+XFT, see the output of ＠code{./configure --help}. If you use a package
+manager from your OS distribution, you may need to install development
+packages for ＠file{fontconfig} and ＠file{Xft}, and possibly for their
+prequisites.
To specify a particular antialiased font, put something like the
-following lines in your ＠file{~/.Xdefaults} or ＠file{~.Xresources}
-(using ＠code{#define} in ＠file{.Xresources} avoids boring hand
-substitution):
+following lines in your ＠file{~/.Xdefaults} or ＠file{~/.Xresources}:
＠example
-#define MONO Mono
-#define SANS Sans
-#define PTSIZEM 12
-#define PTSIZES 11
- XEmacs.default.attributeFont: MONO:size=PTSIZEM
- XEmacs.bold.attributeFont: MONO:size=PTSIZEM:style=Bold
- XEmacs.italic.attributeFont: MONO:size=PTSIZEM:style=Oblique
-XEmacs.bold-italic.attributeFont: MONO:size=PTSIZEM:style=Bold Oblique
- XEmacs.modeline.attributeFont: SANS:size=PTSIZES
- XEmacs.menubar.font: SANS:size=PTSIZES
- XEmacs*xftFont: SANS:size=PTSIZES
+ XEmacs.default.attributeFont: monospace-12
+ XEmacs.bold.attributeFont: monospace-12:style=Bold
+ XEmacs.italic.attributeFont: monospace-12:style=Oblique
+XEmacs.bold-italic.attributeFont: monospace-12:style=Bold Oblique
+ XEmacs.modeline.attributeFont: sans-serif-11
+ XEmacs.menubar.xftFont: sans-serif-11
+ XEmacs*XftFont: sans-serif-11
＠end example
-And run ＠code{xrdb -merge} before starting the new, XFT-enabled xemacs.
-You can choose the available fonts from the list given by
-＠code{fc-list}; try ＠code{xfd -fa FONTNAME-SIZE} to preview a given font.
+＠strong{Warning}: These resource naming conventions are just hacks to
+get the code running; you should expect them to change. (Sorry about
+that, but this ＠emph{is} beta software!)
+
+Then run ＠code{xrdb -merge} before starting the new, XFT-enabled
+xemacs. You can choose the available fonts from the list given by
+＠code{fc-list}; try ＠code{xfd -fa FONTNAME-SIZE} to preview a given
+font. Note that ``monospace'' and ``sans-serif'' are generic aliases
+defined by fontconfig which may correspond to any of many real fonts
+based on local configuration and availability of the aliased fonts,
+and so are likely to give good results in a well-set-up system.
+
+Although Customize does not yet handle fontconfig fontspecs, you can
+pass them as strings directly to ＠samp{set-face-font} to set fonts from
+Lisp.
＠unnumberedsec 5.1: Microsoft Windows
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
commit: Improve package documentation.
15 years, 5 months
Stephen Turnbull
changeset: 4508:742a23369b74e442741e2c333da6fab80854093a
parent: 4488:6b0000935adc3f79cb189350d6014d4b4aff734e
user: Stephen J. Turnbull <stephen(a)xemacs.org>
date: Sat Aug 02 02:43:19 2008 -0700
files: INSTALL
description:
Improve package documentation.
diff -r 6b0000935adc3f79cb189350d6014d4b4aff734e -r 742a23369b74e442741e2c333da6fab80854093a INSTALL
--- a/INSTALL Sat Jul 26 13:50:27 2008 +0300
+++ b/INSTALL Sat Aug 02 02:43:19 2008 -0700
＠＠ -1,7 +1,7 ＠＠ XEmacs Installation Guide
XEmacs Installation Guide
Copyright (c) 1994, 1995, 1996 Board of Trustees, University of Illinois
-Copyright (c) 1994-1999, 2003 Free Software Foundation, Inc.
+Copyright (c) 1994-1999, 2003, 2008 Free Software Foundation, Inc.
Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the
＠＠ -61,11 +61,13 ＠＠ PACKAGE SYSTEM
PACKAGE SYSTEM
==============
-The file README.packages contain information vital to have a fully
+The FAQ sections 1.7 and 2.1 contain information vital to have a fully
working XEmacs. It includes a description of available packages, and
how to bootstrap XEmacs from a minimal or a complete set of packages.
This information was not included in this file only because it is too
-large for this terse INSTALL. Please read README.packages now!
+large for this terse INSTALL. The FAQ is available in Texinfo format
+in man/xemacs-faq.texi, as an Info file once you build XEmacs, and
+online at http://www.xemacs.org/Documentation/21.5/html/xemacs-faq_1.html.
ADD-ON LIBRARIES
================
＠＠ -794,8 +796,8 ＠＠ remove the files that `configure' create
remove the files that `configure' created (so you can compile XEmacs
for a different configuration), type `make distclean'.
-READ README.packages
-====================
+READ THE FAQ
+============
Do it!
＠＠ -803,8 +805,8 ＠＠ PROBLEMS
========
The most common problem is that you forgot to read and follow the
-directions in README.packages. You can not have a normal XEmacs
-without downloading some additional packages.
+directions for installing bootstrap packages in the FAQ. You can not
+have a normal XEmacs without downloading some additional packages.
See the file PROBLEMS in this directory for a list of various problems
sometimes encountered, and what to do about them. PROBLEMS is also
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
[AC21.5] Fix some warnings for G++ build
15 years, 5 months
Stephen J. Turnbull
APPROVE COMMIT 21.5
Thanks to Mike Fabian ＠ Novell for his unrelated bug report that got
me to try GCC 4.3.2 (MacPorts build on Mac OS X 10.4.11, PPC) with and
without G++.
The change to configure.ac weakens to checks for G++ to a name
including "g++" rather than exactly "g++", which is needed if you have
multiple builds of GCC.
The change to src/lisp.h casts away the warnings that recent g++ emits
about implicit conversions of actual function arguments from const
char to char. As the log says, this would require a fair amount of
work to actually fix. There are a few more in emacs.c and other
places, but they might be fixable with minimal effort....
diff -r dd12adb12b8f -r 66411359ce4e ChangeLog
--- a/ChangeLog Sat Oct 04 13:57:55 2008 +0900
+++ b/ChangeLog Sat Oct 25 21:40:46 2008 +0900
＠＠ -0,0 +1,4 ＠＠
+2008-10-25 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * configure.ac (xemacs_cc_cc_mismatch): Improve g++ detection.
+
diff -r dd12adb12b8f -r 66411359ce4e src/ChangeLog
--- a/src/ChangeLog Sat Oct 04 13:57:55 2008 +0900
+++ b/src/ChangeLog Sat Oct 25 21:40:46 2008 +0900
＠＠ -0,0 +1,7 ＠＠
+2008-10-25 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * lisp.h (static_pro): Cast out a warning.
+ g++ 4.3 complains about the conversion of const char to char.
+ These end up in a dynarray, so we would need to define a whole new
+ class of dynarray just to handle the const char stuff.
+
diff -r dd12adb12b8f -r 66411359ce4e configure.ac
--- a/configure.ac Sat Oct 04 13:57:55 2008 +0900
+++ b/configure.ac Sat Oct 25 21:40:46 2008 +0900
＠＠ -2239,18 +2239,25 ＠＠
dnl If we're specifying XEMACS_CC, it'd better be in the same family
dnl as CC or the following flag calculations are bogus.
-dnl #### We may want to actually error and abort here, but I am not sure.
+dnl No error/abort; detection is too fragile.
+
+xemacs_cc_cc_mismatch=no
if test "$CC" != "$XEMACS_CC"; then
- if test "$XEMACS_CC" = "g++" -a "$GCC" != "yes"; then
- AC_MSG_WARN([CC and g++ are mismatched; XE_CFLAGS may be wrong])
- xemacs_cc_cc_mismatch=yes
- elif test -n "$GCC" -a "$XEMACS_CC" != "g++"; then
- AC_MSG_WARN([gcc and XEMACS_CC are mismatched; XE_CFLAGS may be wrong])
- xemacs_cc_cc_mismatch=yes
+ case "$XEMACS_CC" in
+ *g++* )
+ if test "$GCC" != "yes"; then
+ AC_MSG_WARN([CC and g++ are mismatched; XE_CFLAGS may be wrong])
+ xemacs_cc_cc_mismatch=yes ;;
+ esac
+ if test -n "$GCC"; then
+ case $XEMACS_CC in
+ *g++* )
+ ;;
+ * )
+ AC_MSG_WARN([gcc and XEMACS_CC are mismatched; XE_CFLAGS may be wrong])
+ xemacs_cc_cc_mismatch=yes ;;
+ esac
dnl #### Add other detectable mismatches here.
- else
- xemacs_cc_cc_mismatch=no
- fi
fi
dnl Calculate optimization flags. These will be off by default in beta
diff -r dd12adb12b8f -r 66411359ce4e src/lisp.h
--- a/src/lisp.h Sat Oct 04 13:57:55 2008 +0900
+++ b/src/lisp.h Sat Oct 25 21:40:46 2008 +0900
＠＠ -3815,12 +3815,16 ＠＠
MODULE_API void staticpro_1 (Lisp_Object *, Ascbyte *);
MODULE_API void staticpro_nodump_1 (Lisp_Object *, Ascbyte *);
-#define staticpro(ptr) staticpro_1 (ptr, #ptr)
-#define staticpro_nodump(ptr) staticpro_nodump_1 (ptr, #ptr)
+/* g++ 4.3 complains about the conversion of const char to char.
+ These end up in a dynarray, so we would need to define a whole new class
+ of dynarray just to handle the const char stuff.
+ ####Check to see how hard this might be. */
+#define staticpro(ptr) staticpro_1 (ptr, (Ascbyte *) #ptr)
+#define staticpro_nodump(ptr) staticpro_nodump_1 (ptr, (Ascbyte *) #ptr)
#ifdef HAVE_SHLIB
MODULE_API void unstaticpro_nodump_1 (Lisp_Object *, Ascbyte *);
-#define unstaticpro_nodump(ptr) unstaticpro_nodump_1 (ptr, #ptr)
+#define unstaticpro_nodump(ptr) unstaticpro_nodump_1 (ptr, (Ascbyte *) #ptr)
#endif
#else
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches