(face-font-family-alternatives, variable-pitch): Use

"Sans Serif", not "Sans-Serif".

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0b28ea2e5b36aff1e22f8cf79ac525a93a694d77..585b4b3ebe3a8eadb80a3864a9b3524f8d7cf7f7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-25  Andreas Schwab  <schwab@suse.de>
+
+       * faces.el (face-font-family-alternatives, variable-pitch): Use
+       "Sans Serif", not "Sans-Serif".
+
 2008-06-24  Chong Yidong  <cyd@stupidchicken.com>
 
        * faces.el (face-font-family-alternatives, variable-pitch): Change

diff --git a/lisp/faces.el b/lisp/faces.el
index 25493c6150098ce6785119b5c982c3f88e05a31f..aa18e29582ea324038fa3b1e4e76c76ae348a434 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -59,13 +59,13 @@ a font height that isn't optimal."
           (internal-set-font-selection-order value)))
 
 
-;; In the absence of Fontconfig support, Monospace and Sans-Serif are
+;; 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-Serif" "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 ...).
@@ -2229,7 +2229,7 @@ terminal type to a different value."
   :group 'basic-faces)
 
 (defface variable-pitch
-  '((t :family "Sans-Serif"))
+  '((t :family "Sans Serif"))
   "The basic variable-pitch face."
   :group 'basic-faces)