# HG changeset patch
# User stephent
# Date 1037073144 0
# Node ID 30118fdc4f1f066f3a95ac704e1e7461032bc6b8
# Parent  e30625c17fc0f36acdd8f16bac45f253f15235d3
[xemacs-hg @ 2002-11-12 03:52:23 by stephent]
font-menu.el 21.4 synch <87y97zwiof.fsf@tleepslib.sk.tsukuba.ac.jp>

diff -r e30625c17fc0 -r 30118fdc4f1f lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Nov 11 22:53:14 2002 +0000
+++ b/lisp/ChangeLog	Tue Nov 12 03:52:24 2002 +0000
@@ -1,3 +1,13 @@
+2002-11-12  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	Synch to 21.4 (suggested by Edward M. Lee <edward@tailifer.com>):
+
+	* font-menu.el (font-menu-set-font): Make sure values for family,
+	size, and weight are defaulted non-nil.  Fix indentation.
+	(font-menu-size-scaling): 
+	(font-menu-preferred-resolution):
+	Provide specs for GTK+.
+
 2002-11-03  Mike Sperber <mike@xemacs.org>
 
 	* code-process.el (call-process-region): Preserve return value
diff -r e30625c17fc0 -r 30118fdc4f1f lisp/font-menu.el
--- a/lisp/font-menu.el	Mon Nov 11 22:53:14 2002 +0000
+++ b/lisp/font-menu.el	Tue Nov 12 03:52:24 2002 +0000
@@ -137,11 +137,13 @@
 
 (defvar font-menu-preferred-resolution
   (make-specifier-and-init 'generic '((global ((mswindows) . ":")
+					      ((gtk) . "*-*")
 					      ((x) . "*-*"))) t)
   "Preferred horizontal and vertical font menu resolution (e.g. \"75:75\").")
 
 (defvar font-menu-size-scaling
   (make-specifier-and-init 'integer '((global ((mswindows) . 1)
+					      ((gtk) . 10)
 					      ((x) . 10))) t)
   "Scale factor used in defining font sizes.")
 
@@ -284,7 +286,7 @@
 	 (font-data (font-menu-font-data 'default dcache))
 	 (from-family (aref font-data 1))
 	 (from-size   (aref font-data 2))
-	   (from-weight (aref font-data 3))
+	 (from-weight (aref font-data 3))
 	 (from-slant  (aref font-data 4))
   	 (face-list-to-change (delq 'default (face-list)))
 	 new-default-face-font)
@@ -315,7 +317,9 @@
 	(condition-case c
 	    (font-menu-change-face face
 				   from-family from-weight from-size
-				   family      weight      size)
+				   (or family from-family)
+				   (or weight from-weight)
+				   (or size from-size))
 	  (error
 	   (display-error c nil)
 	   (sit-for 1)))))
@@ -330,7 +334,7 @@
       ;; OK Let Customize do it.
       (custom-set-face-update-spec 'default
 				   (list (list 'type (device-type)))
-				   (list :family family
+				   (list :family (or family from-family)
 					 :size (concat
 						(int-to-string
 						 (/ (or size from-size)