Mercurial > hg > xemacs-beta

diff lisp/x-faces.el @ 3747:c13b89ba4796

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2006-12-17 11:25:58 by aidan] Don't use the server-side fallbacks for XFT.
author aidan
date Sun, 17 Dec 2006 11:26:09 +0000
parents 98af8a976fc3
children 049dc907c17a
line wrap: on
line diff
--- a/lisp/x-faces.el	Sat Dec 16 22:51:14 2006 +0000
+++ b/lisp/x-faces.el	Sun Dec 17 11:26:09 2006 +0000
@@ -791,18 +791,19 @@
       ;; since we don't want to try andale-mono's ISO-10646-1 encoding for
       ;; Amharic or Thai. This is fragile; it depends on the code in
       ;; faces.c.
-      (dolist (assocked '((x encode-as-utf-8 initial)
-			  (x two-dimensional initial)
-			  (x one-dimensional final)
-			  (x two-dimensional final)))
-	(when (and (specifierp (face-font face))
-		   (consp (specifier-fallback (face-font face)))
-		   (setq assocked 
-			 (assoc assocked 
-				(specifier-fallback
-				 (face-font face)))))
-	  (set-face-font face (cdr assocked) locale
-			 (nreverse (car assocked)) append))))
+      (unless (featurep 'xft-fonts)
+        (dolist (assocked '((x encode-as-utf-8 initial)
+                            (x two-dimensional initial)
+                            (x one-dimensional final)
+                            (x two-dimensional final)))
+          (when (and (specifierp (face-font face))
+                     (consp (specifier-fallback (face-font face)))
+                     (setq assocked 
+                           (assoc assocked 
+                                  (specifier-fallback
+                                   (face-font face)))))
+            (set-face-font face (cdr assocked) locale
+                           (nreverse (car assocked)) append)))))
 		     
     ;; Kludge-o-rooni.  Set the foreground and background resources for
     ;; X devices only -- otherwise things tend to get all messed up