# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1214331485 0
# Node ID 514c1dae72dbc302d223b2dc7232ce582a0f74f1
# Parent  d49e0625d346d5c7551515f9dca68f813b6641de
(face-font-family-alternatives, variable-pitch): Change "Sans" to the
canonical name "Sans-Serif".

diff -r d49e0625d346 -r 514c1dae72db lisp/faces.el
--- a/lisp/faces.el	Tue Jun 24 18:17:55 2008 +0000
+++ b/lisp/faces.el	Tue Jun 24 18:18:05 2008 +0000
@@ -59,11 +59,13 @@
 	   (internal-set-font-selection-order value)))
 
 
-;; This is defined originally in xfaces.c.
+;; In the absence of Fontconfig support, Monospace and Sans-Serif are
+;; unavailable, and we fall back on the courier and helv families,
+;; which are generally available.
 (defcustom face-font-family-alternatives
   '(("Monospace" "courier" "fixed")
     ("courier" "fixed")
-    ("Sans" "helv" "helvetica" "arial" "fixed")
+    ("Sans-Serif" "helv" "helvetica" "arial" "fixed")
     ("helv" "helvetica" "arial" "fixed"))
   "*Alist of alternative font family names.
 Each element has the form (FAMILY ALTERNATIVE1 ALTERNATIVE2 ...).
@@ -2227,7 +2229,7 @@
   :group 'basic-faces)
 
 (defface variable-pitch
-  '((t :family "Sans"))
+  '((t :family "Sans-Serif"))
   "The basic variable-pitch face."
   :group 'basic-faces)