xemacs-beta: lisp/x-faces.el comparison

[xemacs-hg @ 2006-12-17 11:25:58 by aidan] Don't use the server-side fallbacks for XFT.

comparison

equal deleted inserted replaced

-:8052943fe6a7
+:c13b89ba4796
 ;
 ;; And retain some of the fallbacks in the generated default face,
 ;; 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)
+(unless (featurep 'xft-fonts)
-			  (x two-dimensional initial)
+(dolist (assocked '((x encode-as-utf-8 initial)
-			  (x one-dimensional final)
+(x two-dimensional initial)
-			  (x two-dimensional final)))
+(x one-dimensional final)
-	(when (and (specifierp (face-font face))
+(x two-dimensional final)))
-		   (consp (specifier-fallback (face-font face)))
+(when (and (specifierp (face-font face))
-		   (setq assocked
+(consp (specifier-fallback (face-font face)))
-			 (assoc assocked
+(setq assocked
-				(specifier-fallback
+(assoc assocked
-				 (face-font face)))))
+(specifier-fallback
-	  (set-face-font face (cdr assocked) locale
+(face-font face)))))
-			 (nreverse (car assocked)) append))))
+(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
 ;; if you start up an X frame and then later create a TTY frame.
 (when fg

Mercurial > hg > xemacs-beta