(msdos-color-aliases): Add more aliases.

(msdos-face-setup): Change colors for bold, bold-italic, underline.
(x-frob-font-slant): Define as no-op.

diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el
index 8e888c674b4f1285e899299d30264c57d523817d..95b8cfc0c31dea5b4af1c8e4420183745f303c5b 100644 (file)
--- a/lisp/term/pc-win.el
+++ b/lisp/term/pc-win.el
@@ -36,7 +36,19 @@
     ("darkgoldenrod"  . "brown")
     ("goldenrod"      . "yellow")
     ("grey40"         . "darkgray")
-    ("rosybrown"      . "brown"))
+    ("rosybrown"      . "brown")
+    ("blue"          . "lightblue")  ;; from here: for Enriched Text
+    ("darkslategray"  .        "darkgray")
+    ("orange"        . "brown")
+    ("light blue"     .        "lightblue")  ;; from here: for cpp-highlight
+    ("light cyan"     .        "lightcyan")
+    ("light yellow"   .        "yellow")
+    ("light pink"     .        "lightred")
+    ("pale green"     .        "lightgreen")
+    ("beige"         . "brown")
+    ("medium purple"  .        "magenta")
+    ("turquoise"      . "lightgreen")
+    ("violet"        . "magenta"))
   "List of alternate names for colors.")
 
 (defun msdos-color-translate (name)
@@ -84,10 +96,10 @@
 (defun msdos-face-setup ()
   (modify-frame-parameters (selected-frame) default-frame-alist)
 
-  (set-face-foreground 'bold "white")
+  (set-face-foreground 'bold "yellow")
   (set-face-foreground 'italic "red")
-  (set-face-foreground 'bold-italic "yellow")
-  (set-face-foreground 'underline "blue")
+  (set-face-foreground 'bold-italic "lightred")
+  (set-face-foreground 'underline "white")
   (set-face-background 'region "green")
 
   (make-face 'msdos-menu-active-face)
@@ -136,6 +148,11 @@
 (defun x-get-selection (&rest rest) "")
 (fset 'x-set-selection 'ignore)
 
+;; From lisp/faces.el: we only have one font, so always return
+;; it, no matter which variety they've asked for.
+(defun x-frob-font-slant (font which)
+  font)
+
 ;; From lisp/frame.el
 (fset 'set-default-font 'ignore)
 (fset 'set-mouse-color 'ignore)                ; We cannot, I think.