(msdos-color-aliases): Add missing colors.

(msdos-color-translate): Handle "deep" and "pale" color
varieties.

diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el
index a29c149..b5a4aea 100644 (file)
--- a/lisp/term/pc-win.el
+++ b/lisp/term/pc-win.el
@@ -81,6 +81,8 @@
     ("navy blue"       . "cyan")
     ("navyblue"                . "cyan")
     ("navy"            . "cyan")
+    ("royalblue"       . "blue")
+    ("royal blue"      . "blue")
     ("sky blue"                . "lightblue")
     ("skyblue"         . "lightblue")
     ("dodger blue"     . "blue")
@@ -92,9 +94,12 @@
     ("steel blue"      . "blue")
     ("steelblue"       . "blue")
     ("coral"           . "lightred")
+    ("tomato"          . "lightred")
     ("firebrick"       . "red")
     ("gold"            . "yellow")
     ("goldenrod"       . "yellow")
+    ("goldenrod yellow"        . "yellow")
+    ("goldenrodyellow" . "yellow")
     ("pale goldenrod"  . "yellow")
     ("palegoldenrod"   . "yellow")
     ("olive green"     . "lightgreen")
@@ -109,8 +114,6 @@
     ("seagreen"                . "lightcyan")
     ("spring green"    . "green")
     ("springgreen"     . "green")
-    ("pale green"      . "lightgreen")
-    ("palegreen"       . "lightgreen")
     ("lawn green"      . "lightgreen")
     ("lawngreen"       . "lightgreen")
     ("chartreuse"      . "yellow")
@@ -137,9 +140,13 @@
     ("orchid"          . "brown")
     ("saddle brown"    . "red")
     ("saddlebrown"     . "red")
-    ("sienna"          . "red")
     ("peru"            . "red")
+    ("burlywood"       . "brown")
+    ("sandy brown"     . "brown")
+    ("sandybrown"      . "brown")
     ("pink"            . "lightred")
+    ("hotpink"         . "lightred")
+    ("hot pink"                ."lightred")
     ("plum"            . "magenta")
     ("indian red"      . "red")
     ("indianred"       . "red")
@@ -150,6 +157,7 @@
     ("salmon"          .  "lightred")
     ("sienna"          . "lightred")
     ("tan"             . "lightred")
+    ("chocolate"       . "brown")
     ("thistle"         . "magenta")
     ("turquoise"       . "lightgreen")
     ("pale turquoise"  . "cyan")
@@ -161,7 +169,6 @@
     ("green yellow"    . "yellow")
     ("greenyellow"     . "yellow")
     ("purple"          . "magenta")
-    ("royalblue"       . "blue")
     ("rosybrown"       . "brown")
     ("rosy brown"      . "brown")
     ("beige"           . "brown"))
@@ -185,6 +192,14 @@
             (string= "light " (substring name 0 6))
             (setq try (msdos-color-translate (substring name 6)))
             (logior try 8))
+       (and (> len 4)
+            (string= "pale" (substring name 0 4))
+            (setq try (msdos-color-translate (substring name 4)))
+            (logior try 8))
+       (and (> len 5)
+            (string= "pale " (substring name 0 5))
+            (setq try (msdos-color-translate (substring name 5)))
+            (logior try 8))
        (and (> len 6)
             (string= "medium" (substring name 0 6))
             (msdos-color-translate (substring name 6)))
@@ -192,10 +207,12 @@
             (string= "medium " (substring name 0 7))
             (msdos-color-translate (substring name 7)))
        (and (> len 4)
-            (string= "dark" (substring name 0 4))
+            (or (string= "dark" (substring name 0 4))
+                (string= "deep" (substring name 0 4)))
             (msdos-color-translate (substring name 4)))
        (and (> len 5)
-            (string= "dark " (substring name 0 5))
+            (or (string= "dark " (substring name 0 5))
+                (string= "deep " (substring name 0 5)))
             (msdos-color-translate (substring name 5)))
        (and (> len 4) ;; gray shades: gray0 to gray100
             (save-match-data