(fixed-pitch): Use "Monospace" family.

(variable-pitch): Use "Sans" family.
(face-font-family-alternatives): Define alternatives for "Sans"
and "Monospace".

diff --git a/lisp/faces.el b/lisp/faces.el
index 643b50a1316ccde5da4d11c5122d469ba2c1242d..1867cda0df1400ebcfaa76d856c58b5475a883c7 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -61,7 +61,9 @@ a font height that isn't optimal."
 
 ;; This is defined originally in xfaces.c.
 (defcustom face-font-family-alternatives
-  '(("courier" "fixed")
+  '(("Monospace" "courier" "fixed")
+    ("courier" "fixed")
+    ("Sans" "helv" "helvetica" "arial" "fixed")
     ("helv" "helvetica" "arial" "fixed"))
   "*Alist of alternative font family names.
 Each element has the form (FAMILY ALTERNATIVE1 ALTERNATIVE2 ...).
@@ -2220,12 +2222,12 @@ terminal type to a different value."
   :group 'basic-faces)
 
 (defface fixed-pitch
-  '((t :family "courier"))
+  '((t :family "Monospace"))
   "The basic fixed-pitch face."
   :group 'basic-faces)
 
 (defface variable-pitch
-  '((t :family "helv"))
+  '((t :family "Sans"))
   "The basic variable-pitch face."
   :group 'basic-faces)