[Emacs-diffs] emacs lisp/ChangeLog lisp/cus-start.el lisp/fon...

[Jan Djärv]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Jan Djärv <jhd> 09/11/17 20:17:50

Modified files:
        lisp           : ChangeLog cus-start.el font-setting.el 
        src            : ChangeLog xsettings.c 

Log message:
        xsettings.c didn't check font-use-system-font, fix that.
        * xsettings.c (something_changedCB, Ffont_get_system_font): Check
        use_system_font.
        (syms_of_xsettings): DEFVAR font-use-system-font.
        
        * font-setting.el (font-use-system-font): Moved ...
        
        * cus-start.el (all): ... to here.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16657&r2=1.16658
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/cus-start.el?cvsroot=emacs&r1=1.140&r2=1.141
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/font-setting.el?cvsroot=emacs&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7878&r2=1.7879
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xsettings.c?cvsroot=emacs&r1=1.3&r2=1.4

Patches:
Index: lisp/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16657
retrieving revision 1.16658
diff -u -b -r1.16657 -r1.16658
--- lisp/ChangeLog      17 Nov 2009 14:58:08 -0000      1.16657
+++ lisp/ChangeLog      17 Nov 2009 20:17:46 -0000      1.16658
@@ -1,3 +1,9 @@
+2009-11-17  Jan Djärv  <address@hidden>
+
+       * font-setting.el (font-use-system-font): Moved ...
+
+       * cus-start.el (all): ... to here.
+
 2009-11-17  Michael Albinus  <address@hidden>
 
        * net/tramp.el (tramp-advice-file-expand-wildcards): Simplify.

Index: lisp/cus-start.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/cus-start.el,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -b -r1.140 -r1.141
--- lisp/cus-start.el   18 Sep 2009 15:33:31 -0000      1.140
+++ lisp/cus-start.el   17 Nov 2009 20:17:49 -0000      1.141
@@ -351,7 +351,9 @@
             ;; xterm.c
             (x-use-underline-position-properties display boolean "22.1")
             (x-underline-at-descent-line display boolean "22.1")
-            (x-stretch-cursor display boolean "21.1")))
+            (x-stretch-cursor display boolean "21.1")
+            ;; xsettings.c
+            (font-use-system-font font-selection boolean "23.2")))
       this symbol group type standard version native-p
       ;; This function turns a value
       ;; into an expression which produces that value.

Index: lisp/font-setting.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/font-setting.el,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- lisp/font-setting.el        17 Nov 2009 08:21:31 -0000      1.1
+++ lisp/font-setting.el        17 Nov 2009 20:17:49 -0000      1.2
@@ -31,20 +31,6 @@
 
 ;;; Customizable variables
 
-(defun font-setting-set-system-font (symbol value)
-  (set-default symbol value)
-  (if (symbol-value symbol)
-      (let ((f (selected-frame)))
-       (if (display-graphic-p f)
-           (font-setting-change-default-font f t)))))
-
-(defcustom font-use-system-font nil
-  "If non-nil, use the system monospaced font"
-  :version "23.2"
-  :type 'boolean
-  :group 'font-selection
-  :set 'font-setting-set-system-font)
-
 (declare-function font-get-system-font "xsettings.c" ())
 
 (defun font-setting-change-default-font (display-or-frame set-font)
@@ -75,13 +61,15 @@
                    (if set-font new-font
                      ;; else set font again, hinting etc. may have changed.
                      frame-font)))
+             (if font-to-set
              (progn
+                   (message "setting %s" font-to-set)
                (set-frame-parameter f 'font-parameter font-to-set)
                (set-face-attribute 'default f 
                                    :width 'normal
                                    :weight 'normal
                                    :slant 'normal
-                                   :font font-to-set)))))
+                                       :font font-to-set))))))
     
       ;; Set for future frames.
       (set-face-attribute 'default t :font new-font)

Index: src/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7878
retrieving revision 1.7879
diff -u -b -r1.7878 -r1.7879
--- src/ChangeLog       17 Nov 2009 19:13:14 -0000      1.7878
+++ src/ChangeLog       17 Nov 2009 20:17:49 -0000      1.7879
@@ -1,3 +1,9 @@
+2009-11-17  Jan Djärv  <address@hidden>
+
+       * xsettings.c (something_changedCB, Ffont_get_system_font): Check
+       use_system_font.
+       (syms_of_xsettings): DEFVAR font-use-system-font.
+
 2009-11-17  Andreas Schwab  <address@hidden>
 
        * xfns.c (x_default_font_parameter): Remove dead assignment.

Index: src/xsettings.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xsettings.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/xsettings.c     17 Nov 2009 13:47:31 -0000      1.3
+++ src/xsettings.c     17 Nov 2009 20:17:50 -0000      1.4
@@ -40,6 +40,7 @@
 static char *current_mono_font;
 static struct x_display_info *first_dpyinfo;
 static Lisp_Object Qfont_name, Qfont_render;
+static int use_system_font;
 
 #ifdef HAVE_GCONF
 static GConfClient *gconf_client;
@@ -96,7 +97,7 @@
       for (dpyinfo = x_display_list; !found && dpyinfo; dpyinfo = 
dpyinfo->next)
         found = dpyinfo == first_dpyinfo;
 
-      if (found)
+      if (found && use_system_font)
         store_font_changed_event (Qfont_name,
                                   XCAR (first_dpyinfo->name_list_element));
     }
@@ -610,7 +611,7 @@
        doc: /* Get the system default monospaced font. */)
   ()
 {
-  return current_mono_font
+  return current_mono_font && use_system_font
     ? make_string (current_mono_font, strlen (current_mono_font))
     : Qnil;
 }
@@ -630,6 +631,10 @@
   staticpro (&Qfont_render);
   defsubr (&Sfont_get_system_font);
 
+  DEFVAR_BOOL ("font-use-system-font", &use_system_font,
+    doc: /* *Non-nil means to use the system defined font.  */);
+  use_system_font = 0;
+
 #ifdef HAVE_GCONF
   Fprovide (intern_c_string ("system-font-setting"), Qnil);
 #endif