(face-font-family-alternatives, variable-pitch): Change "Sans" to the

canonical name "Sans-Serif".

diff --git a/lisp/faces.el b/lisp/faces.el
index 1867cda0df1400ebcfaa76d856c58b5475a883c7..25493c6150098ce6785119b5c982c3f88e05a31f 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -59,11 +59,13 @@ a font height that isn't optimal."
           (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 @@ terminal type to a different value."
   :group 'basic-faces)
 
 (defface variable-pitch
-  '((t :family "Sans"))
+  '((t :family "Sans-Serif"))
   "The basic variable-pitch face."
   :group 'basic-faces)