Merge from origin/emacs-25

[gnu-emacs] / lisp / faces.el

diff --git a/lisp/faces.el b/lisp/faces.el
index 71c94e563c763d2b3f5b13dbf78b3f7c44ac0940..d5fc3ce834b0919379f324426861524dfc8e1293 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -98,7 +98,31 @@ a font height that isn't optimal."
 (defcustom face-font-family-alternatives
   (mapcar (lambda (arg) (mapcar 'purecopy arg))
   '(("Monospace" "courier" "fixed")
 (defcustom face-font-family-alternatives
   (mapcar (lambda (arg) (mapcar 'purecopy arg))
   '(("Monospace" "courier" "fixed")

+
+    ;; Monospace Serif is an Emacs invention, intended to work around
+    ;; portability problems when using Courier.  It should work well
+    ;; when combined with Monospaced and with other standard fonts.
+    ("Monospace Serif"
+
+     ;; This looks good on GNU/Linux.
+     "Courier 10 Pitch"
+     ;; This looks good on MS-Windows and OS X.
+     "Consolas"
+     ;; This looks good on OS X.  "Courier" looks good too, but is
+     ;; jagged on GNU/Linux and so is listed later as "courier".
+     "Courier Std"
+     ;; Although these are anti-aliased, they are a bit faint compared
+     ;; to the above.
+     "FreeMono" "Nimbus Mono L"
+     ;; These are aliased and look jagged.
+     "courier" "fixed"
+     ;; Omit Courier New, as it is the default MS-Windows font and so
+     ;; would look no different, and is pretty faint on other platforms.
+     )
+
+    ;; This is present for backward compatibility.

     ("courier" "CMU Typewriter Text" "fixed")
     ("courier" "CMU Typewriter Text" "fixed")

+

     ("Sans Serif" "helv" "helvetica" "arial" "fixed")
     ("helv" "helvetica" "arial" "fixed")))
   "Alist of alternative font family names.
     ("Sans Serif" "helv" "helvetica" "arial" "fixed")
     ("helv" "helvetica" "arial" "fixed")))
   "Alist of alternative font family names.


@@ -2318,6 +2342,11 @@ If you set `term-file-prefix' to nil, this function does nothing."
   "The basic fixed-pitch face."
   :group 'basic-faces)
 
   "The basic fixed-pitch face."
   :group 'basic-faces)
 

+(defface fixed-pitch-serif
+  '((t :family "Monospace Serif"))
+  "The basic fixed-pitch face with serifs."
+  :group 'basic-faces)
+

 (defface variable-pitch
   '((((type w32))
      ;; This is a kludgy workaround for an issue discussed in
 (defface variable-pitch
   '((((type w32))
      ;; This is a kludgy workaround for an issue discussed in


@@ -2489,7 +2518,6 @@ If you set `term-file-prefix' to nil, this function does nothing."
   :version "22.1"
   :group 'mode-line-faces
   :group 'basic-faces)
   :version "22.1"
   :group 'mode-line-faces
   :group 'basic-faces)

-(define-obsolete-face-alias 'modeline-inactive 'mode-line-inactive "22.1")

 
 (defface mode-line-highlight
   '((((class color) (min-colors 88))
 
 (defface mode-line-highlight
   '((((class color) (min-colors 88))


@@ -2500,7 +2528,6 @@ If you set `term-file-prefix' to nil, this function does nothing."
   :version "22.1"
   :group 'mode-line-faces
   :group 'basic-faces)
   :version "22.1"
   :group 'mode-line-faces
   :group 'basic-faces)

-(define-obsolete-face-alias 'modeline-highlight 'mode-line-highlight "22.1")

 
 (defface mode-line-emphasis
   '((t (:weight bold)))
 
 (defface mode-line-emphasis
   '((t (:weight bold)))


@@ -2516,7 +2543,6 @@ Use the face `mode-line-highlight' for features that can be selected."
   :version "22.1"
   :group 'mode-line-faces
   :group 'basic-faces)
   :version "22.1"
   :group 'mode-line-faces
   :group 'basic-faces)

-(define-obsolete-face-alias 'modeline-buffer-id 'mode-line-buffer-id "22.1")

 
 (defface header-line
   '((default
 
 (defface header-line
   '((default