Commit 8b571bf3 authored by Jan Djärv's avatar Jan Djärv

* cus-start.el (all): Add native condition for font-use-system-font.

* configure.in: Don't check for GConf unless X is used.
parent 872870b2
2009-11-21 Jan Djärv <jan.h.d@swipnet.se>
* configure.in: Don't check for GConf unless X is used.
2009-11-20 Dan Nicolaescu <dann@ics.uci.edu>
* configure.in: Use -Wdeclaration-after-statement if available.
......
......@@ -12588,7 +12588,7 @@ done
fi
HAVE_GCONF=no
if test "${with_gconf}" = "yes"; then
if test "X$with_x" != "Xno" && test "${with_gconf}" = "yes"; then
succeeded=no
......
......@@ -1756,7 +1756,7 @@ fi
dnl GConf has been tested under GNU/Linux only.
dnl The version is really arbitrary, it is about the same age as Gtk+ 2.6.
HAVE_GCONF=no
if test "${with_gconf}" = "yes"; then
if test "X$with_x" != "Xno" && test "${with_gconf}" = "yes"; then
PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.13, HAVE_GCONF=yes, HAVE_GCONF=no)
if test "$HAVE_GCONF" = yes; then
AC_DEFINE(HAVE_GCONF, 1, [Define to 1 if using GConf.])
......
2009-11-21 Jan Djärv <jan.h.d@swipnet.se>
* cus-start.el (all): Add native condition for font-use-system-font.
2009-11-21 Nathaniel Flath <flat0103@gmail.com>
* progmodes/cc-menus.el (cc-imenu-java-generic-expression): A
......
......@@ -397,6 +397,8 @@ since it could result in memory overflow and make Emacs crash."
(fboundp 'x-selection-exists-p))
((string-match "fringe" (symbol-name symbol))
(fboundp 'define-fringe-bitmap))
((equal "font-use-system-font" (symbol-name symbol))
(featurep 'system-font-setting))
(t t))))
(if (not (boundp symbol))
;; If variables are removed from C code, give an error here!
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment