[COMMIT] Fix dummy chartab_range initializers.
7 years, 7 months
Aidan Kehoe
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1494486788 -3600
# Thu May 11 08:13:08 2017 +0100
# Node ID a0268c5597f37d95723b9570254be522f714986c
# Parent eec2a31de9d67f78b606314136ed13abb364046d
Fix dummy chartab_range initializers.
diff -r eec2a31de9d6 -r a0268c5597f3 src/ChangeLog
--- a/src/ChangeLog Sat Apr 22 00:23:36 2017 +0100
+++ b/src/ChangeLog Thu May 11 08:13:08 2017 +0100
＠＠ -1,3 +1,10 ＠＠
+2017-04-27 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * chartab.c (char_table_print_preprocess):
+ (char_table_nsubst_structures_descend):
+ data.c (build_fixnum_to_char_map):
+ Fix chartab_range initializers.
+
2017-04-21 Aidan Kehoe <kehoea(a)parhasard.net>
* elhash.c (intern_istring):
diff -r eec2a31de9d6 -r a0268c5597f3 src/chartab.c
--- a/src/chartab.c Sat Apr 22 00:23:36 2017 +0100
+++ b/src/chartab.c Thu May 11 08:13:08 2017 +0100
＠＠ -157,7 +157,7 ＠＠
char_table_print_preprocess (Lisp_Object object, Lisp_Object print_number_table,
Elemcount *seen_object_count)
{
- struct chartab_range ctr = { CHARTAB_RANGE_ALL, 0, Qnil, 0 };
+ struct chartab_range ctr = { CHARTAB_RANGE_ALL, 0, 0, Qnil, 0 };
preprocess_info_t preprocess_info = { print_number_table, seen_object_count };
map_char_table (object, &ctr, print_preprocess_mapper, &preprocess_info);
}
＠＠ -193,7 +193,7 ＠＠
Lisp_Object number_table,
Boolint test_not_unboundp)
{
- struct chartab_range ctr = { CHARTAB_RANGE_ALL, 0, Qnil, 0 };
+ struct chartab_range ctr = { CHARTAB_RANGE_ALL, 0, 0, Qnil, 0 };
nsubst_structures_info_t nsubst_structures_info
= { number_table, new_, old, object, test_not_unboundp };
diff -r eec2a31de9d6 -r a0268c5597f3 src/data.c
--- a/src/data.c Sat Apr 22 00:23:36 2017 +0100
+++ b/src/data.c Thu May 11 08:13:08 2017 +0100
＠＠ -1504,7 +1504,7 ＠＠
build_fixnum_to_char_map (Lisp_Object radix_table)
{
Lisp_Object highest_value, result;
- struct chartab_range ctr = { CHARTAB_RANGE_ALL, 0, Qnil, 0 };
+ struct chartab_range ctr = { CHARTAB_RANGE_ALL, 0, 0, Qnil, 0 };
Ichar *cctable;
EMACS_INT ii, cclen;
Ibyte *data;
--
‘As I sat looking up at the Guinness ad, I could never figure out /
How your man stayed up on the surfboard after forty pints of stout’
(C. Moore)
- 1 participants
- 0 comments
[COMMIT] Work around type +/- template problems on the C++ build, text.h
7 years, 7 months
Aidan Kehoe
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1494529136 -3600
# Thu May 11 19:58:56 2017 +0100
# Node ID 50b05df76160d68a18c7afcaf4f66c0fb339dcbe
# Parent a0268c5597f37d95723b9570254be522f714986c
Work around type +/- template problems on the C++ build, text.h
src/ChangeLog addition:
2017-05-11 Aidan Kehoe <kehoea(a)parhasard.net>
* alloc.c (resize_string):
Use set_string_byte() here for the zero termination.
* text.h:
Make string_byte(), set_string_byte() into inline functions to
work around g++ type (+/- template) difficulties with the macro
versions.
diff -r a0268c5597f3 -r 50b05df76160 src/ChangeLog
--- a/src/ChangeLog Thu May 11 08:13:08 2017 +0100
+++ b/src/ChangeLog Thu May 11 19:58:56 2017 +0100
＠＠ -1,3 +1,12 ＠＠
+2017-05-11 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * alloc.c (resize_string):
+ Use set_string_byte() here for the zero termination.
+ * text.h:
+ Make string_byte(), set_string_byte() into inline functions to
+ work around g++ type (+/- template) difficulties with the macro
+ versions.
+
2017-04-27 Stephen J. Turnbull <stephen(a)xemacs.org>
* chartab.c (char_table_print_preprocess):
diff -r a0268c5597f3 -r 50b05df76160 src/alloc.c
--- a/src/alloc.c Thu May 11 08:13:08 2017 +0100
+++ b/src/alloc.c Thu May 11 19:58:56 2017 +0100
＠＠ -3143,7 +3143,7 ＠＠
XSET_STRING_LENGTH (s, XSTRING_LENGTH (s) + delta);
/* If pos < 0, the string won't be zero-terminated.
Terminate now just to make sure. */
- XSTRING_DATA (s)[XSTRING_LENGTH (s)] = '\0';
+ set_string_byte (s, XSTRING_LENGTH (s), '\0');
if (pos >= 0)
/* We also have to adjust all of the extent indices after the
diff -r a0268c5597f3 -r 50b05df76160 src/text.h
--- a/src/text.h Thu May 11 08:13:08 2017 +0100
+++ b/src/text.h Thu May 11 19:58:56 2017 +0100
＠＠ -1935,11 +1935,24 ＠＠
#define string_char_length(s) \
string_index_byte_to_char (s, XSTRING_LENGTH (s))
-/* Without the cast, C++ promotes the following expression to an int and then
- complains about a narrowing cast when it is used as an Ibyte. */
-#define string_byte(s, i) (Ibyte) (XSTRING_DATA (s)[i] + 0)
+
+DECLARE_INLINE_HEADER (
+Ibyte
+string_byte (Lisp_Object s, Bytecount i)
+)
+{
+ /* C++ deals with a macro version of this badly. */
+ return XSTRING_DATA (s)[i];
+}
/* In case we ever allow strings to be in a different format ... */
-#define set_string_byte(s, i, c) (XSTRING_DATA (s)[i] = (c))
+DECLARE_INLINE_HEADER (
+Ibyte
+set_string_byte(Lisp_Object s, Bytecount i, Ibyte c)
+)
+{
+ /* See above re C++. */
+ return XSTRING_DATA (s)[i] = (c);
+}
#define ASSERT_VALID_CHAR_STRING_INDEX_UNSAFE(s, x) do { \
text_checking_assert ((x) >= 0 && x <= string_char_length (s)); \
--
‘As I sat looking up at the Guinness ad, I could never figure out /
How your man stayed up on the surfboard after forty pints of stout’
(C. Moore)
- 1 participants
- 0 comments
[COMMIT] Restrict the integer values passed as the ZONE argument, #'encode-time
7 years, 7 months
Aidan Kehoe
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1494532970 -3600
# Thu May 11 21:02:50 2017 +0100
# Node ID d745116738120282e98054133b2835e04a206758
# Parent 50b05df76160d68a18c7afcaf4f66c0fb339dcbe
Restrict the integer values passed as the ZONE argument, #'encode-time
src/ChangeLog addition:
2017-05-11 Aidan Kehoe <kehoea(a)parhasard.net>
* editfns.c (Fencode_time):
Restrict the possible integer values passed as the ZONE argument
to this function, as per the OS X and Linux documentation for
tzset(3).
tests/ChangeLog addition:
2017-05-11 Aidan Kehoe <kehoea(a)parhasard.net>
* automated/os-tests.el:
Test restrictions just introduced to the integer values passed as
the ZONE argument to #'encode-time.
diff -r 50b05df76160 -r d74511673812 src/ChangeLog
--- a/src/ChangeLog Thu May 11 19:58:56 2017 +0100
+++ b/src/ChangeLog Thu May 11 21:02:50 2017 +0100
＠＠ -1,3 +1,10 ＠＠
+2017-05-11 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * editfns.c (Fencode_time):
+ Restrict the possible integer values passed as the ZONE argument
+ to this function, as per the OS X and Linux documentation for
+ tzset(3).
+
2017-05-11 Aidan Kehoe <kehoea(a)parhasard.net>
* alloc.c (resize_string):
diff -r 50b05df76160 -r d74511673812 src/editfns.c
--- a/src/editfns.c Thu May 11 19:58:56 2017 +0100
+++ b/src/editfns.c Thu May 11 21:02:50 2017 +0100
＠＠ -1230,24 +1230,40 ＠＠
/* #### This business of modifying environ is horrendous!
Why don't we just putenv()? Why don't we implement our own
funs that don't require this futzing? */
- Extbyte tzbuf[100];
+ Ibyte tzbuf[100];
Extbyte *tzstring;
Extbyte **oldenv = environ, **newenv;
if (STRINGP (zone))
tzstring = LISP_STRING_TO_EXTERNAL (zone, Qtime_zone_encoding);
- else if (FIXNUMP (zone))
+ else if (INTEGERP (zone))
{
- int abszone = abs (XFIXNUM (zone));
- /* We specify the time zone in offset notation (see `man
- tzset' for details). The offset indicates the value one
- must add to local time to arrive at UTC. Thus, we sign
- the offset with a `-' if the time zone is east of GMT; we
- sign the offset with a `+' if the time zone is GMT (then
- the offset is 0) or if the time zone is west of GMT. */
- sprintf (tzbuf, "XXX%s%d:%02d:%02d", (XFIXNUM (zone) < 0) ? "+" : "-",
- abszone / (60*60), (abszone/60) % 60, abszone % 60);
- tzstring = tzbuf;
+ int abszone;
+ Bytecount bufwritten;
+
+ /* The number of hours must be less or equal to 24, documented as
+ such on OS X and Linux as of 2017. */
+ check_integer_range (zone, make_fixnum (-86400),
+ make_fixnum (86400));
+
+ abszone = abs ((int) (XFIXNUM (zone)));
+
+ /* We specify the time zone in offset notation (see `man tzset' for
+ details). The offset indicates the value one must add to local
+ time to arrive at UTC; the Emacs sign convention is the opposite
+ of that used by tzset(3).
+
+ Thus, we sign the offset with a `-' if the time zone is east of
+ GMT; we sign the offset with a `+' if the time zone is GMT (then
+ the offset is 0) or if the time zone is west of GMT. */
+ bufwritten
+ = emacs_snprintf (tzbuf, sizeof (tzbuf), "XXX%s%d:%02d:%02d",
+ XFIXNUM (zone) <= 0 ? "+" : "-",
+ abszone / (60*60),
+ (abszone/60) % 60,
+ abszone % 60);
+ assert (bufwritten < (Bytecount) (sizeof (tzbuf)));
+ tzstring = (Extbyte *) tzbuf;
}
else
invalid_argument ("Invalid time zone specification", Qunbound);
diff -r 50b05df76160 -r d74511673812 tests/ChangeLog
--- a/tests/ChangeLog Thu May 11 19:58:56 2017 +0100
+++ b/tests/ChangeLog Thu May 11 21:02:50 2017 +0100
＠＠ -1,3 +1,9 ＠＠
+2017-05-11 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * automated/os-tests.el:
+ Test restrictions just introduced to the integer values passed as
+ the ZONE argument to #'encode-time.
+
2017-03-16 Aidan Kehoe <kehoea(a)parhasard.net>
* automated/lisp-reader-tests.el (args-out-of-range):
diff -r 50b05df76160 -r d74511673812 tests/automated/os-tests.el
--- a/tests/automated/os-tests.el Thu May 11 19:58:56 2017 +0100
+++ b/tests/automated/os-tests.el Thu May 11 21:02:50 2017 +0100
＠＠ -123,4 +123,13 ＠＠
do
(Assert (string= post (substitute-in-file-name pre))))
+;; Check some restrictions introduced to the ZONE argument to #'encode-time.
+
+(Check-Error (encode-time 24 4 20 11 5 2017 -86401) args-out-of-range)
+(Assert (equal (encode-time 24 4 20 11 5 2017 -86400)
+ '(22806 . 5448))) ;; "05/12/17 09:04:25 PM"
+(Assert (equal (encode-time 24 4 20 11 5 2017 86400)
+ '(22803 . 29256))) ;; "05/10/17 09:04:24 PM"
+(Check-Error (encode-time 24 4 20 11 5 2017 86401) args-out-of-range)
+
;;; end of os-tests.el
--
‘As I sat looking up at the Guinness ad, I could never figure out /
How your man stayed up on the surfboard after forty pints of stout’
(C. Moore)
- 1 participants
- 0 comments
[PATCH] Changes the default so with-xft=yes results in xft activated
7 years, 7 months
The XEmacs Package Smoketest
The XEmacs Package Smoketest
Hi,
My first hg patch coming up. Please inspect carefully.
Maybe not a wise thing to start with changing configure
behavior. After running make configure I got unexpected changes in
lib-src/config.values.in. Am I doing something wrong here? Details
below.
There seemed to be a typo concerning with-xft-gauge and
with-xft-gauges that results in gauges beeing selected unconditionally
if with_xft_emacs=yes. I guess xft-gauges isn't used at the moment so
it may be left as it is for some reason. Stephen?
# HG changeset patch
# User Mats Lidell <matsl(a)xemacs.org>
# Date 1217196051 -7200
# Node ID 2e80c89e982f64e78281062454bfd06de74df56f
# Parent 6b0000935adc3f79cb189350d6014d4b4aff734e
Changes the default for with-xft so that with-xft=yes results in a
default that has xft activated.
Also fixes a typo. Both with-xft-gauge and with-xft-gauges was present.
diff -r 6b0000935adc -r 2e80c89e982f ChangeLog
--- a/ChangeLog Sat Jul 26 13:50:27 2008 +0300
+++ b/ChangeLog Mon Jul 28 00:00:51 2008 +0200
＠＠ -1,3 +1,8 ＠＠
+2008-07-27 Mats Lidell <matsl(a)xemacs.org>
+
+ * configure.ac (XE_COMPLEX_ARG): Use different defaults for with-xft
+ and without-xft.
+
2008-07-06 Ville Skytt~ <scop(a)xemacs.org>
* configure.ac (xe_fst):
diff -r 6b0000935adc -r 2e80c89e982f configure
--- a/configure Sat Jul 26 13:50:27 2008 +0300
+++ b/configure Mon Jul 28 00:00:51 2008 +0200
＠＠ -1426,10 +1426,6 ＠＠
--enable-FEATURE[=ARG] alias for --with-FEATURE
--without-FEATURE do not use FEATURE (same as --with-FEATURE=no)
--disable-FEATURE alias for --without-FEATURE
-
-Compilation options
--------------------
-
--with-compiler C compiler to use
--with-xemacs-compiler compiler to use to compile just the xemacs
executable and C modules. If you want to compile
＠＠ -1538,7 +1534,8 ＠＠
`gauges'. Prefix component with `no' to disable its
use of Xft. Requires X11, Xft, Xrender, freetype,
and fontconfig support. Default is `noemacs,
- nomenubars, notabs, nogauges'.
+ nomenubars, notabs, nogauges'. The default when
+ selected is `emacs, nomenubars, notabs, nogauges'.
--with-gtk Support GTK on the X Window System. (EXPERIMENTAL)
--with-gnome Support GNOME on the X Window System. (EXPERIMENTAL)
--with-msw Support MS Windows as a window system (only under
＠＠ -2266,7 +2263,6 ＠＠
MAKE_SUBDIR="$MAKE_SUBDIR lib-src" && if test "$verbose" = "yes"; then echo " Appending \"lib-src\" to \$MAKE_SUBDIR"; fi
INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR lib-src" && if test "$verbose" = "yes"; then echo " Appending \"lib-src\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
with_dragndrop_default="no"
-
# If --with-compiler or --without-compiler were given then copy the value to the
# equivalent enable_compiler variable.
if test "${with_compiler+set}" = set; then
＠＠ -2888,12 +2884,12 ＠＠
fi;
_xft_notfirst=""
-_xft_emacs_default=no
+_xft_emacs_default=yes
_xft_menubars_default=no
_xft_tabs_default=no
_xft_gauges_default=no
_xft_types="emacs menubars tabs gauges"
-_xft_default="noemacs,nomenubars,notabs,nogauges"
+_xft_default="emacs,nomenubars,notabs,nogauges"
# If --with-xft or --without-xft were given then copy the value to the
# equivalent enable_xft variable.
＠＠ -2970,7 +2966,7 ＠＠
eval "enable_xft_$y=\$_xft_${y}_default"
unset _xft_${y}_default
done
-
+with_xft_emacs=no
fi;
# If --with-gtk or --without-gtk were given then copy the value to the
# equivalent enable_gtk variable.
＠＠ -27332,11 +27328,11 ＠＠
with_xft_tabs="no"
fi
fi
-if test "$with_xft_gauge" != "no" ; then
+if test "$with_xft_gauges" != "no" ; then
if test "$with_xft_emacs" = "yes" -a "$enable_widgets" != "no" ; then
- with_xft_gauge="yes"
- else
- with_xft_gauge="no"
+ with_xft_gauges="yes"
+ else
+ with_xft_gauges="no"
fi
fi
＠＠ -27528,8 +27524,8 ＠＠
#define USE_XFT_TABS 1
_ACEOF
-test "$with_xft_gauge" = "yes" && cat >>confdefs.h <<\_ACEOF
-#define USE_XFT_GAUGE 1
+test "$with_xft_gauges" = "yes" && cat >>confdefs.h <<\_ACEOF
+#define USE_XFT_GAUGES 1
_ACEOF
diff -r 6b0000935adc -r 2e80c89e982f configure.ac
--- a/configure.ac Sat Jul 26 13:50:27 2008 +0300
+++ b/configure.ac Mon Jul 28 00:00:51 2008 +0200
＠＠ -540,23 +540,7 ＠＠
dnl Note that AS_HELP_STRING compresses whitespace, wraps, and indents the
dnl string to fit the --help display; there's no need to preformat.
dnl
-dnl I think these will be caught by autoconf internal checks,
-dnl only --with-* are unchecked
-dnl --external-widget --enable-external-widget
-dnl --native-sound-lib=LIB --with-native-sound-lib
-dnl --mail-locking=TYPE --with-mail-locking
-dnl --rel-alloc --with-rel-alloc
-dnl --use-number-lib --enable-bignum
-dnl --debug --enable-debug
-dnl --error-checking --enable-error-checking
-dnl --memory-usage-stats --enable-memory-usage-stats
-dnl --quick-build --enable-quick-build
-dnl --use-union-type --enable-union-type
-dnl --pdump --enable-pdump
-dnl --use-kkcc --enable-kkcc
-dnl
-dnl parse flags
-XE_HELP_SUBSECTION([Compilation options])
+dnl I think these will be caught by autoconf inFTE_HELP_SUBSECTION([Compilation options])
XE_MERGED_ARG([compiler],
AS_HELP_STRING([--with-compiler],[C compiler to use]),
[], [])
＠＠ -690,9 +674,10 ＠＠
[Xft],
[`emacs' (buffers), `menubars', `tabs', and `gauges'],
[X11, Xft, Xrender, freetype, and fontconfig],
- [`noemacs, nomenubars, notabs, nogauges'])],
- [],[],
- [XE_COMPLEX_OPTION([emacs],[no]),
+ [`noemacs, nomenubars, notabs, nogauges'.
+ The default when selected is `emacs, nomenubars, notabs, nogauges'])],
+ [],[with_xft_emacs=no],
+ [XE_COMPLEX_OPTION([emacs],[yes]),
XE_COMPLEX_OPTION([menubars],[no]),
XE_COMPLEX_OPTION([tabs],[no]),
XE_COMPLEX_OPTION([gauges],[no])])
＠＠ -3540,7 +3525,7 ＠＠
AC_DEFINE(HAVE_FONTCONFIG)
AC_DEFINE(USE_XFT)
dnl Due to interactions with other libraries, must postpone AC_DEFINE
- dnl of USE_XFT_MENUBARS, USE_XFT_TABS, and USE_XFT_GAUGE.
+ dnl of USE_XFT_MENUBARS, USE_XFT_TABS, and USE_XFT_GAUGES.
unset xft_includes_found
fi
fi
＠＠ -4429,11 +4414,11 ＠＠
fi
fi
dnl this is not in xft reloaded #3
-if test "$with_xft_gauge" != "no" ; then
+if test "$with_xft_gauges" != "no" ; then
if test "$with_xft_emacs" = "yes" -a "$enable_widgets" != "no" ; then
- with_xft_gauge="yes"
- else
- with_xft_gauge="no"
+ with_xft_gauges="yes"
+ else
+ with_xft_gauges="no"
fi
fi
＠＠ -4526,7 +4511,7 ＠＠
test "$with_xft_menubars" = "yes" && AC_DEFINE(USE_XFT_MENUBARS)
test "$with_xft_tabs" = "yes" && AC_DEFINE(USE_XFT_TABS)
-test "$with_xft_gauge" = "yes" && AC_DEFINE(USE_XFT_GAUGE)
+test "$with_xft_gauges" = "yes" && AC_DEFINE(USE_XFT_GAUGES)
dnl ----------------------
dnl Mule-dependent options
diff -r 6b0000935adc -r 2e80c89e982f lib-src/config.values.in
--- a/lib-src/config.values.in Sat Jul 26 13:50:27 2008 +0300
+++ b/lib-src/config.values.in Mon Jul 28 00:00:51 2008 +0200
＠＠ -15,178 +15,6 ＠＠
;;; Variables defined in configure by AC_SUBST follow:
;;; (These are used in Makefiles)
-ALLOCA "＠ALLOCA＠"
-ARCHLIBDIR "＠ARCHLIBDIR＠"
-ARCHLIBDIR_USER_DEFINED "＠ARCHLIBDIR_USER_DEFINED＠"
-CC "＠CC＠"
-CFLAGS "＠CFLAGS＠"
-CPP "＠CPP＠"
-CPPFLAGS "＠CPPFLAGS＠"
-DEFS "＠DEFS＠"
-DOCDIR "＠DOCDIR＠"
-DOCDIR_USER_DEFINED "＠DOCDIR_USER_DEFINED＠"
-EARLY_PACKAGE_DIRECTORIES "＠EARLY_PACKAGE_DIRECTORIES＠"
-EARLY_PACKAGE_DIRECTORIES_USER_DEFINED "＠EARLY_PACKAGE_DIRECTORIES_USER_DEFINED＠"
-ECHO_C "＠ECHO_C＠"
-ECHO_N "＠ECHO_N＠"
-ECHO_T "＠ECHO_T＠"
-EGREP "＠EGREP＠"
-ETCDIR "＠ETCDIR＠"
-ETCDIR_USER_DEFINED "＠ETCDIR_USER_DEFINED＠"
-EXEC_PREFIX "＠EXEC_PREFIX＠"
-EXEC_PREFIX_USER_DEFINED "＠EXEC_PREFIX_USER_DEFINED＠"
-EXEEXT "＠EXEEXT＠"
-GTK_CONFIG "＠GTK_CONFIG＠"
-INFODIR "＠INFODIR＠"
-INFODIR_USER_DEFINED "＠INFODIR_USER_DEFINED＠"
-INFOPATH "＠INFOPATH＠"
-INFOPATH_USER_DEFINED "＠INFOPATH_USER_DEFINED＠"
-INSTALL "＠INSTALL＠"
-INSTALLPATH "＠INSTALLPATH＠"
-INSTALL_ARCH_DEP_SUBDIR "＠INSTALL_ARCH_DEP_SUBDIR＠"
-INSTALL_DATA "＠INSTALL_DATA＠"
-INSTALL_PROGRAM "＠INSTALL_PROGRAM＠"
-INSTALL_SCRIPT "＠INSTALL_SCRIPT＠"
-LAST_PACKAGE_DIRECTORIES "＠LAST_PACKAGE_DIRECTORIES＠"
-LAST_PACKAGE_DIRECTORIES_USER_DEFINED "＠LAST_PACKAGE_DIRECTORIES_USER_DEFINED＠"
-LATE_PACKAGE_DIRECTORIES "＠LATE_PACKAGE_DIRECTORIES＠"
-LATE_PACKAGE_DIRECTORIES_USER_DEFINED "＠LATE_PACKAGE_DIRECTORIES_USER_DEFINED＠"
-LDFLAGS "＠LDFLAGS＠"
-LIBOBJS "＠LIBOBJS＠"
-LIBS "＠LIBS＠"
-LIBSTDCPP "＠LIBSTDCPP＠"
-LISPDIR "＠LISPDIR＠"
-LISPDIR_USER_DEFINED "＠LISPDIR_USER_DEFINED＠"
-LN_S "＠LN_S＠"
-LTLIBOBJS "＠LTLIBOBJS＠"
-MAKE_DOCFILE "＠MAKE_DOCFILE＠"
-MAKE_SUBDIR "＠MAKE_SUBDIR＠"
-MODARCHDIR "＠MODARCHDIR＠"
-MODCFLAGS "＠MODCFLAGS＠"
-MODULEDIR "＠MODULEDIR＠"
-MODULEDIR_USER_DEFINED "＠MODULEDIR_USER_DEFINED＠"
-MOD_CC "＠MOD_CC＠"
-MOD_INSTALL_PROGRAM "＠MOD_INSTALL_PROGRAM＠"
-OBJECT_TO_BUILD "＠OBJECT_TO_BUILD＠"
-OBJEXT "＠OBJEXT＠"
-PACKAGE_BUGREPORT "＠PACKAGE_BUGREPORT＠"
-PACKAGE_NAME "＠PACKAGE_NAME＠"
-PACKAGE_PATH "＠PACKAGE_PATH＠"
-PACKAGE_PATH_USER_DEFINED "＠PACKAGE_PATH_USER_DEFINED＠"
-PACKAGE_STRING "＠PACKAGE_STRING＠"
-PACKAGE_TARNAME "＠PACKAGE_TARNAME＠"
-PACKAGE_VERSION "＠PACKAGE_VERSION＠"
-PATH_SEPARATOR "＠PATH_SEPARATOR＠"
-PREFIX "＠PREFIX＠"
-PREFIX_USER_DEFINED "＠PREFIX_USER_DEFINED＠"
-PROGNAME "＠PROGNAME＠"
-RANLIB "＠RANLIB＠"
-RECURSIVE_MAKE_ARGS "＠RECURSIVE_MAKE_ARGS＠"
-SET_MAKE "＠SET_MAKE＠"
-SHELL "＠SHELL＠"
-SITELISPDIR "＠SITELISPDIR＠"
-SITELISPDIR_USER_DEFINED "＠SITELISPDIR_USER_DEFINED＠"
-SITEMODULEDIR "＠SITEMODULEDIR＠"
-SITEMODULEDIR_USER_DEFINED "＠SITEMODULEDIR_USER_DEFINED＠"
-SRC_SUBDIR_DEPS "＠SRC_SUBDIR_DEPS＠"
-SUBDIR_MAKEFILES "＠SUBDIR_MAKEFILES＠"
-XEMACS_CC "＠XEMACS_CC＠"
-XE_CFLAGS "＠XE_CFLAGS＠"
-X_CFLAGS "＠X_CFLAGS＠"
-X_EXTRA_LIBS "＠X_EXTRA_LIBS＠"
-X_LIBS "＠X_LIBS＠"
-X_PRE_LIBS "＠X_PRE_LIBS＠"
-YACC "＠YACC＠"
-abs_builddir "＠abs_builddir＠"
-abs_srcdir "＠abs_srcdir＠"
-abs_top_builddir "＠abs_top_builddir＠"
-abs_top_srcdir "＠abs_top_srcdir＠"
-ac_ct_CC "＠ac_ct_CC＠"
-ac_ct_RANLIB "＠ac_ct_RANLIB＠"
-archlibdir "＠archlibdir＠"
-bindir "＠bindir＠"
-bitmapdir "＠bitmapdir＠"
-blddir "＠blddir＠"
-build "＠build＠"
-build_alias "＠build_alias＠"
-build_cpu "＠build_cpu＠"
-build_os "＠build_os＠"
-build_vendor "＠build_vendor＠"
-builddir "＠builddir＠"
-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＠"
-datarootdir "＠datarootdir＠"
-dll_cflags "＠dll_cflags＠"
-dll_ld "＠dll_ld＠"
-dll_ldflags "＠dll_ldflags＠"
-dll_ldo "＠dll_ldo＠"
-dll_post "＠dll_post＠"
-dnd_objs "＠dnd_objs＠"
-docdir "＠docdir＠"
-dynodump_arch "＠dynodump_arch＠"
-early_packages "＠early_packages＠"
-etcdir "＠etcdir＠"
-exec_prefix "＠exec_prefix＠"
-extra_includes "＠extra_includes＠"
-extra_objs "＠extra_objs＠"
-have_esd_config "＠have_esd_config＠"
-host_alias "＠host_alias＠"
-includedir "＠includedir＠"
-infodir "＠infodir＠"
-infopath "＠infopath＠"
-install_pp "＠install_pp＠"
-inststaticdir "＠inststaticdir＠"
-instvardir "＠instvardir＠"
-internal_makefile_list "＠internal_makefile_list＠"
-last_packages "＠last_packages＠"
-late_packages "＠late_packages＠"
-ld "＠ld＠"
-ld_dynamic_link_flags "＠ld_dynamic_link_flags＠"
-ld_libs_all "＠ld_libs_all＠"
-ld_libs_general "＠ld_libs_general＠"
-ld_libs_window_system "＠ld_libs_window_system＠"
-ld_switch_all "＠ld_switch_all＠"
-ld_switch_general "＠ld_switch_general＠"
-ld_switch_shared "＠ld_switch_shared＠"
-ld_switch_window_system "＠ld_switch_window_system＠"
-ldap_libs "＠ldap_libs＠"
-lib_gcc "＠lib_gcc＠"
-libdir "＠libdir＠"
-libexecdir "＠libexecdir＠"
-libs_xauth "＠libs_xauth＠"
-lispdir "＠lispdir＠"
-localstatedir "＠localstatedir＠"
-lwlib_objs "＠lwlib_objs＠"
-machfile "＠machfile＠"
-mandir "＠mandir＠"
-moduledir "＠moduledir＠"
-native_sound_lib "＠native_sound_lib＠"
-oldincludedir "＠oldincludedir＠"
-opsysfile "＠opsysfile＠"
-package_path "＠package_path＠"
-postgresql_libs "＠postgresql_libs＠"
-prefix "＠prefix＠"
-program_transform_name "＠program_transform_name＠"
-sbindir "＠sbindir＠"
-sharedstatedir "＠sharedstatedir＠"
-sitelispdir "＠sitelispdir＠"
-sitemoduledir "＠sitemoduledir＠"
-sound_cflags "＠sound_cflags＠"
-srcdir "＠srcdir＠"
-start_files "＠start_files＠"
-start_flags "＠start_flags＠"
-statedir "＠statedir＠"
-sysconfdir "＠sysconfdir＠"
-target_alias "＠target_alias＠"
-top_builddir "＠top_builddir＠"
-top_srcdir "＠top_srcdir＠"
-version "＠version＠"
-with_modules "＠with_modules＠"
;;; Variables defined in configure by AC_DEFINE and AC_DEFINE_UNQUOTED follow:
;;; (These are used in C code)
diff -r 6b0000935adc -r 2e80c89e982f src/ChangeLog
--- a/src/ChangeLog Sat Jul 26 13:50:27 2008 +0300
+++ b/src/ChangeLog Mon Jul 28 00:00:51 2008 +0200
＠＠ -1,3 +1,7 ＠＠
+2008-07-27 Mats Lidell <matsl(a)xemacs.org>
+
+ * config.h.in: Renamed USE_XFT_GAUGES.
+
2008-07-20 John Paul Wallington <jpw(a)pobox.com>
* nt.c (Fmswindows_short_file_name, Fmswindows_long_file_name):
diff -r 6b0000935adc -r 2e80c89e982f src/config.h.in
--- a/src/config.h.in Sat Jul 26 13:50:27 2008 +0300
+++ b/src/config.h.in Mon Jul 28 00:00:51 2008 +0200
＠＠ -20,8 +20,7 ＠＠
Boston, MA 02111-1307, USA. */
/* Significantly divergent from FSF. */
-
-/* No code in XEmacs #includes config.h twice, but some of the code
+XEmacs #includes config.h twice, but some of the code
intended to work with other packages as well (like gmalloc.c)
think they can include it as many times as they like. */
#ifndef _SRC_CONFIG_H_
＠＠ -225,7 +224,7 ＠＠
/* Per-widget stuff will go away? */
#undef USE_XFT_MENUBARS
#undef USE_XFT_TABS
-#undef USE_XFT_GAUGE
+#undef USE_XFT_GAUGES
/* Defines for building X applications */
#ifdef HAVE_X_WINDOWS
Done 00:03:05
--
%% Mats
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 3 participants
- 12 comments