[Emacs-diffs] emacs ChangeLog configure configure.in lisp/Cha...

[Jan Djärv]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Jan Djärv <jhd> 09/11/21 15:40:39

Modified files:
        .              : ChangeLog configure configure.in 
        lisp           : ChangeLog cus-start.el 

Log message:
        * cus-start.el (all): Add native condition for font-use-system-font.
        
        * configure.in: Don't check for GConf unless X is used.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/ChangeLog?cvsroot=emacs&r1=1.868&r2=1.869
http://cvs.savannah.gnu.org/viewcvs/emacs/configure?cvsroot=emacs&r1=1.336&r2=1.337
http://cvs.savannah.gnu.org/viewcvs/emacs/configure.in?cvsroot=emacs&r1=1.615&r2=1.616
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16697&r2=1.16698
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/cus-start.el?cvsroot=emacs&r1=1.141&r2=1.142

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/ChangeLog,v
retrieving revision 1.868
retrieving revision 1.869
diff -u -b -r1.868 -r1.869
--- ChangeLog   20 Nov 2009 06:05:10 -0000      1.868
+++ ChangeLog   21 Nov 2009 15:40:24 -0000      1.869
@@ -1,3 +1,7 @@
+2009-11-21  Jan Djärv  <address@hidden>
+
+       * configure.in: Don't check for GConf unless X is used.
+
 2009-11-20  Dan Nicolaescu  <address@hidden>
 
        * configure.in: Use -Wdeclaration-after-statement if available.

Index: configure
===================================================================
RCS file: /cvsroot/emacs/emacs/configure,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -b -r1.336 -r1.337
--- configure   20 Nov 2009 06:05:10 -0000      1.336
+++ configure   21 Nov 2009 15:40:25 -0000      1.337
@@ -12588,7 +12588,7 @@
 fi
 
 HAVE_GCONF=no
-if test "${with_gconf}" = "yes"; then
+if test "X$with_x" != "Xno" && test "${with_gconf}" = "yes"; then
 
   succeeded=no
 

Index: configure.in
===================================================================
RCS file: /cvsroot/emacs/emacs/configure.in,v
retrieving revision 1.615
retrieving revision 1.616
diff -u -b -r1.615 -r1.616
--- configure.in        20 Nov 2009 06:05:12 -0000      1.615
+++ configure.in        21 Nov 2009 15:40:31 -0000      1.616
@@ -1756,7 +1756,7 @@
 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.])

Index: lisp/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16697
retrieving revision 1.16698
diff -u -b -r1.16697 -r1.16698
--- lisp/ChangeLog      21 Nov 2009 10:31:01 -0000      1.16697
+++ lisp/ChangeLog      21 Nov 2009 15:40:33 -0000      1.16698
@@ -1,3 +1,7 @@
+2009-11-21  Jan Djärv  <address@hidden>
+
+       * cus-start.el (all): Add native condition for font-use-system-font.
+
 2009-11-21  Nathaniel Flath  <address@hidden>
 
        * progmodes/cc-menus.el (cc-imenu-java-generic-expression): A

Index: lisp/cus-start.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/cus-start.el,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -b -r1.141 -r1.142
--- lisp/cus-start.el   17 Nov 2009 20:17:49 -0000      1.141
+++ lisp/cus-start.el   21 Nov 2009 15:40:38 -0000      1.142
@@ -397,6 +397,8 @@
                       (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!