el/dot-emacs.el: Tweak face settings for 256-colour terminals.

Mostly don't distinguish on the basis of display type (tty versus X),
but on the number of colours it can display.  This means we now get the
full panoply in capable terminals.

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index dc619187a37471b8de8a71d351b1412542ec0282..5d252ebefd1de423b1c307e849be7f1f6477a3c5 100644 (file)
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -1252,16 +1252,15 @@ (if (mdw-emacs-version-p 23)
   (mdw-define-face variable-pitch
     (((type x)) :family "helvetica" :height 90)))
 (mdw-define-face region
   (mdw-define-face variable-pitch
     (((type x)) :family "helvetica" :height 90)))
 (mdw-define-face region

-  (((type tty) (class color)) :background "blue")
-  (((type tty) (class mono)) :inverse-video t)
-  (t :background "grey30"))
+  (((min-colors 64)) :background "grey30")
+  (((class color)) :background "blue")
+  ((t) :inverse-video t))

 (mdw-define-face match
 (mdw-define-face match

-  (((type tty) (class color)) :background "blue")
-  (((type tty) (class mono)) :inverse-video t)
-  (t :background "blue"))
+  (((class color)) :background "blue")
+  (t :inverse-video t))

 (mdw-define-face mc/cursor-face
 (mdw-define-face mc/cursor-face

-  (((type tty) (class mono)) :inverse-video t)
-  (t :background "red"))
+  (((class color)) :background "red")
+  (t :inverse-video t))

 (mdw-define-face minibuffer-prompt
   (t :weight bold))
 (mdw-define-face mode-line
 (mdw-define-face minibuffer-prompt
   (t :weight bold))
 (mdw-define-face mode-line


@@ -1286,8 +1285,8 @@ (mdw-define-face show-paren-mismatch
   (((class color)) :background "red")
   (t :inverse-video t))
 (mdw-define-face highlight
   (((class color)) :background "red")
   (t :inverse-video t))
 (mdw-define-face highlight

-  (((type x) (class color)) :background "DarkSeaGreen4")
-  (((type tty) (class color)) :background "cyan")
+  (((min-colors 64)) :background "DarkSeaGreen4")
+  (((class color)) :background "cyan")

   (t :inverse-video t))
 
 (mdw-define-face holiday-face
   (t :inverse-video t))
 
 (mdw-define-face holiday-face


@@ -1317,7 +1316,8 @@ (mdw-define-face whitespace-line
   (((class color)) :background "darkred")
   (t :inverse-video t))
 (mdw-define-face mdw-punct-face
   (((class color)) :background "darkred")
   (t :inverse-video t))
 (mdw-define-face mdw-punct-face

-  (((type tty)) :foreground "yellow") (t :foreground "burlywood2"))
+  (((min-colors 64)) :foreground "burlywood2")
+  (((class color)) :foreground "yellow"))

 (mdw-define-face mdw-number-face
   (t :foreground "yellow"))
 (mdw-define-face mdw-trivial-face)
 (mdw-define-face mdw-number-face
   (t :foreground "yellow"))
 (mdw-define-face mdw-trivial-face)


@@ -1336,78 +1336,102 @@ (mdw-define-face font-lock-reference-face
 (mdw-define-face font-lock-variable-name-face
   (t :slant italic))
 (mdw-define-face font-lock-comment-delimiter-face
 (mdw-define-face font-lock-variable-name-face
   (t :slant italic))
 (mdw-define-face font-lock-comment-delimiter-face

-  (((class mono)) :weight bold)
-  (((type tty) (class color)) :foreground "green")
-  (t :slant italic :foreground "SeaGreen1"))
+  (((min-colors 64)) :slant italic :foreground "SeaGreen1")
+  (((class color)) :foreground "green")
+  (t :weight bold))

 (mdw-define-face font-lock-comment-face
 (mdw-define-face font-lock-comment-face

-  (((class mono)) :weight bold)
-  (((type tty) (class color)) :foreground "green")
-  (t :slant italic :foreground "SeaGreen1"))
+  (((min-colors 64)) :slant italic :foreground "SeaGreen1")
+  (((class color)) :foreground "green")
+  (t :weight bold))

 (mdw-define-face font-lock-string-face
 (mdw-define-face font-lock-string-face

-  (((class mono)) :weight bold)
-  (((class color)) :foreground "SkyBlue1"))
+  (((min-colors 64)) :foreground "SkyBlue1")
+  (((class color)) :foreground "cyan")
+  (t :weight bold))

 
 (mdw-define-face message-separator
   (t :background "red" :foreground "white" :weight bold))
 (mdw-define-face message-cited-text
   (default :slant italic)
 
 (mdw-define-face message-separator
   (t :background "red" :foreground "white" :weight bold))
 (mdw-define-face message-cited-text
   (default :slant italic)

-  (((type tty)) :foreground "cyan") (t :foreground "SkyBlue1"))
+  (((min-colors 64)) :foreground "SkyBlue1")
+  (((class color)) :foreground "cyan"))

 (mdw-define-face message-header-cc
   (default :slant italic)
 (mdw-define-face message-header-cc
   (default :slant italic)

-  (((type tty)) :foreground "green") (t :foreground "SeaGreen1"))
+  (((min-colors 64)) :foreground "SeaGreen1")
+  (((class color)) :foreground "green"))

 (mdw-define-face message-header-newsgroups
   (default :slant italic)
 (mdw-define-face message-header-newsgroups
   (default :slant italic)

-  (((type tty)) :foreground "green") (t :foreground "SeaGreen1"))
+  (((min-colors 64)) :foreground "SeaGreen1")
+  (((class color)) :foreground "green"))

 (mdw-define-face message-header-subject
 (mdw-define-face message-header-subject

-  (((type tty)) :foreground "green") (t :foreground "SeaGreen1"))
+  (((min-colors 64)) :foreground "SeaGreen1")
+  (((class color)) :foreground "green"))

 (mdw-define-face message-header-to
 (mdw-define-face message-header-to

-  (((type tty)) :foreground "green") (t :foreground "SeaGreen1"))
+  (((min-colors 64)) :foreground "SeaGreen1")
+  (((class color)) :foreground "green"))

 (mdw-define-face message-header-xheader
   (default :slant italic)
 (mdw-define-face message-header-xheader
   (default :slant italic)

-  (((type tty)) :foreground "green") (t :foreground "SeaGreen1"))
+  (((min-colors 64)) :foreground "SeaGreen1")
+  (((class color)) :foreground "green"))

 (mdw-define-face message-header-other
   (default :slant italic)
 (mdw-define-face message-header-other
   (default :slant italic)

-  (((type tty)) :foreground "green") (t :foreground "SeaGreen1"))
+  (((min-colors 64)) :foreground "SeaGreen1")
+  (((class color)) :foreground "green"))

 (mdw-define-face message-header-name
   (default :weight bold)
 (mdw-define-face message-header-name
   (default :weight bold)

-  (((type tty)) :foreground "green") (t :foreground "SeaGreen1"))
+  (((min-colors 64)) :foreground "SeaGreen1")
+  (((class color)) :foreground "green"))

 
 (mdw-define-face which-func
   (t nil))
 
 (mdw-define-face gnus-header-name
   (default :weight bold)
 
 (mdw-define-face which-func
   (t nil))
 
 (mdw-define-face gnus-header-name
   (default :weight bold)

-  (((type tty)) :foreground "green") (t :foreground "SeaGreen1"))
+  (((min-colors 64)) :foreground "SeaGreen1")
+  (((class color)) :foreground "green"))

 (mdw-define-face gnus-header-subject
 (mdw-define-face gnus-header-subject

-  (((type tty)) :foreground "green") (t :foreground "SeaGreen1"))
+  (((min-colors 64)) :foreground "SeaGreen1")
+  (((class color)) :foreground "green"))

 (mdw-define-face gnus-header-from
 (mdw-define-face gnus-header-from

-  (((type tty)) :foreground "green") (t :foreground "SeaGreen1"))
+  (((min-colors 64)) :foreground "SeaGreen1")
+  (((class color)) :foreground "green"))

 (mdw-define-face gnus-header-to
 (mdw-define-face gnus-header-to

-  (((type tty)) :foreground "green") (t :foreground "SeaGreen1"))
+  (((min-colors 64)) :foreground "SeaGreen1")
+  (((class color)) :foreground "green"))

 (mdw-define-face gnus-header-content
   (default :slant italic)
 (mdw-define-face gnus-header-content
   (default :slant italic)

-  (((type tty)) :foreground "green") (t :foreground "SeaGreen1"))
+  (((min-colors 64)) :foreground "SeaGreen1")
+  (((class color)) :foreground "green"))

 
 (mdw-define-face gnus-cite-1
 
 (mdw-define-face gnus-cite-1

-  (((type tty)) :foreground "cyan") (t :foreground "SkyBlue1"))
+  (((min-colors 64)) :foreground "SkyBlue1")
+  (((class color)) :foreground "cyan"))

 (mdw-define-face gnus-cite-2
 (mdw-define-face gnus-cite-2

-  (((type tty)) :foreground "blue") (t :foreground "RoyalBlue2"))
+  (((min-colors 64)) :foreground "RoyalBlue2")
+  (((class color)) :foreground "blue"))

 (mdw-define-face gnus-cite-3
 (mdw-define-face gnus-cite-3

-  (((type tty)) :foreground "magenta") (t :foreground "MediumOrchid"))
+  (((min-colors 64)) :foreground "MediumOrchid")
+  (((class color)) :foreground "magenta"))

 (mdw-define-face gnus-cite-4
 (mdw-define-face gnus-cite-4

-  (((type tty)) :foreground "red") (t :foreground "firebrick2"))
+  (((min-colors 64)) :foreground "firebrick2")
+  (((class color)) :foreground "red"))

 (mdw-define-face gnus-cite-5
 (mdw-define-face gnus-cite-5

-  (((type tty)) :foreground "yellow") (t :foreground "burlywood2"))
+  (((min-colors 64)) :foreground "burlywood2")
+  (((class color)) :foreground "yellow"))

 (mdw-define-face gnus-cite-6
 (mdw-define-face gnus-cite-6

-  (((type tty)) :foreground "green") (t :foreground "SeaGreen1"))
+  (((min-colors 64)) :foreground "SeaGreen1")
+  (((class color)) :foreground "green"))

 (mdw-define-face gnus-cite-7
 (mdw-define-face gnus-cite-7

-  (((type tty)) :foreground "cyan") (t :foreground "SlateBlue1"))
+  (((min-colors 64)) :foreground "SlateBlue1")
+  (((class color)) :foreground "cyan"))

 (mdw-define-face gnus-cite-8
 (mdw-define-face gnus-cite-8

-  (((type tty)) :foreground "blue") (t :foreground "RoyalBlue2"))
+  (((min-colors 64)) :foreground "RoyalBlue2")
+  (((class color)) :foreground "blue"))

 (mdw-define-face gnus-cite-9
 (mdw-define-face gnus-cite-9

-  (((type tty)) :foreground "magenta") (t :foreground "purple2"))
+  (((min-colors 64)) :foreground "purple2")
+  (((class color)) :foreground "magenta"))

 (mdw-define-face gnus-cite-10
 (mdw-define-face gnus-cite-10

-  (((type tty)) :foreground "red") (t :foreground "DarkOrange2"))
+  (((min-colors 64)) :foreground "DarkOrange2")
+  (((class color)) :foreground "red"))

 (mdw-define-face gnus-cite-11
   (t :foreground "grey"))
 
 (mdw-define-face gnus-cite-11
   (t :foreground "grey"))
 


@@ -1418,98 +1442,101 @@ (mdw-define-face diff-index
 (mdw-define-face diff-file-header
   (t :weight bold))
 (mdw-define-face diff-hunk-header
 (mdw-define-face diff-file-header
   (t :weight bold))
 (mdw-define-face diff-hunk-header

-  (t :foreground "SkyBlue1"))
+  (((min-colors 64)) :foreground "SkyBlue1")
+  (((class color)) :foreground "cyan"))

 (mdw-define-face diff-function
 (mdw-define-face diff-function

-  (t :foreground "SkyBlue1" :weight bold))
+  (default :weight bold)
+  (((min-colors 64)) :foreground "SkyBlue1")
+  (((class color)) :foreground "cyan"))

 (mdw-define-face diff-header
 (mdw-define-face diff-header

-  (t :background "grey10"))
+  (((min-colors 64)) :background "grey10"))

 (mdw-define-face diff-added
 (mdw-define-face diff-added

-  (t :foreground "green"))
+  (((class color)) :foreground "green"))

 (mdw-define-face diff-removed
 (mdw-define-face diff-removed

-  (t :foreground "red"))
+  (((class color)) :foreground "red"))

 (mdw-define-face diff-context
   (t nil))
 (mdw-define-face diff-refine-change
 (mdw-define-face diff-context
   (t nil))
 (mdw-define-face diff-refine-change

-  (((class color) (type x)) :background "RoyalBlue4")
+  (((min-colors 64)) :background "RoyalBlue4")

   (t :underline t))
 (mdw-define-face diff-refine-removed
   (t :underline t))
 (mdw-define-face diff-refine-removed

-  (((class color) (type x)) :background "#500")
+  (((min-colors 64)) :background "#500")

   (t :underline t))
 (mdw-define-face diff-refine-added
   (t :underline t))
 (mdw-define-face diff-refine-added

-  (((class color) (type x)) :background "#050")
+  (((min-colors 64)) :background "#050")

   (t :underline t))
 
 (setq ediff-force-faces t)
 (mdw-define-face ediff-current-diff-A
   (t :underline t))
 
 (setq ediff-force-faces t)
 (mdw-define-face ediff-current-diff-A

-  (((class color) (type x)) :background "darkred")
-  (((class color) (type tty)) :background "red")
+  (((min-colors 64)) :background "darkred")
+  (((class color)) :background "red")

   (t :inverse-video t))
 (mdw-define-face ediff-fine-diff-A
   (t :inverse-video t))
 (mdw-define-face ediff-fine-diff-A

-  (((class color) (type x)) :background "red3")
-  (((class color) (type tty)) :inverse-video t)
+  (((min-colors 64)) :background "red3")
+  (((class color)) :inverse-video t)

   (t :inverse-video nil))
 (mdw-define-face ediff-even-diff-A
   (t :inverse-video nil))
 (mdw-define-face ediff-even-diff-A

-  (((class color) (type x)) :background "#300"))
+  (((min-colors 64)) :background "#300"))

 (mdw-define-face ediff-odd-diff-A
 (mdw-define-face ediff-odd-diff-A

-  (((class color) (type x)) :background "#300"))
+  (((min-colors 64)) :background "#300"))

 (mdw-define-face ediff-current-diff-B
 (mdw-define-face ediff-current-diff-B

-  (((class color) (type x)) :background "darkgreen")
-  (((class color) (type tty)) :background "magenta")
+  (((min-colors 64)) :background "darkgreen")
+  (((class color)) :background "magenta")

   (t :inverse-video t))
 (mdw-define-face ediff-fine-diff-B
   (t :inverse-video t))
 (mdw-define-face ediff-fine-diff-B

-  (((class color) (type x)) :background "green4")
-  (((class color) (type tty)) :inverse-video t)
+  (((min-colors 64)) :background "green4")
+  (((class color)) :inverse-video t)

   (t :inverse-video nil))
 (mdw-define-face ediff-even-diff-B
   (t :inverse-video nil))
 (mdw-define-face ediff-even-diff-B

-  (((class color) (type x)) :background "#020"))
+  (((min-colors 64)) :background "#020"))

 (mdw-define-face ediff-odd-diff-B
 (mdw-define-face ediff-odd-diff-B

-  (((class color) (type x)) :background "#020"))
+  (((min-colors 64)) :background "#020"))

 (mdw-define-face ediff-current-diff-C
 (mdw-define-face ediff-current-diff-C

-  (((class color) (type x)) :background "darkblue")
-  (((class color) (type tty)) :background "blue")
+  (((min-colors 64)) :background "darkblue")
+  (((class color)) :background "blue")

   (t :inverse-video t))
 (mdw-define-face ediff-fine-diff-C
   (t :inverse-video t))
 (mdw-define-face ediff-fine-diff-C

-  (((class color) (type x)) :background "blue1")
-  (((class color) (type tty)) :inverse-video t)
+  (((min-colors 64)) :background "blue1")
+  (((class color)) :inverse-video t)

   (t :inverse-video nil))
 (mdw-define-face ediff-even-diff-C
   (t :inverse-video nil))
 (mdw-define-face ediff-even-diff-C

-  (((class color) (type x)) :background "#004"))
+  (((min-colors 64)) :background "#004"))

 (mdw-define-face ediff-odd-diff-C
 (mdw-define-face ediff-odd-diff-C

-  (((class color) (type x)) :background "#004"))
+  (((min-colors 64)) :background "#004"))

 (mdw-define-face ediff-current-diff-Ancestor
 (mdw-define-face ediff-current-diff-Ancestor

-  (((class color) (type x)) :background "#630")
-  (((class color) (type tty)) :background "blue")
+  (((min-colors 64)) :background "#630")
+  (((class color)) :background "blue")

   (t :inverse-video t))
 (mdw-define-face ediff-even-diff-Ancestor
   (t :inverse-video t))
 (mdw-define-face ediff-even-diff-Ancestor

-  (((class color) (type x)) :background "#320"))
+  (((min-colors 64)) :background "#320"))

 (mdw-define-face ediff-odd-diff-Ancestor
 (mdw-define-face ediff-odd-diff-Ancestor

-  (((class color) (type x)) :background "#320"))
+  (((min-colors 64)) :background "#320"))

 
 (mdw-define-face magit-hash
 
 (mdw-define-face magit-hash

-  (((class color) (type x)) :foreground "grey40")
-  (((class color) (type tty)) :foreground "blue"))
+  (((min-colors 64)) :foreground "grey40")
+  (((class color)) :foreground "blue"))

 (mdw-define-face magit-diff-hunk-heading
 (mdw-define-face magit-diff-hunk-heading

-  (((class color) (type x)) :foreground "grey70" :background "grey25")
-  (((class color) (type tty)) :foreground "yellow"))
+  (((min-colors 64)) :foreground "grey70" :background "grey25")
+  (((class color)) :foreground "yellow"))

 (mdw-define-face magit-diff-hunk-heading-highlight
 (mdw-define-face magit-diff-hunk-heading-highlight

-  (((class color) (type x)) :foreground "grey70" :background "grey35")
-  (((class color) (type tty)) :foreground "yellow" :background "blue"))
+  (((min-colors 64)) :foreground "grey70" :background "grey35")
+  (((class color)) :foreground "yellow" :background "blue"))

 (mdw-define-face magit-diff-added
 (mdw-define-face magit-diff-added

-  (((class color) (type x)) :foreground "#ddffdd" :background "#335533")
-  (((class color) (type tty)) :foreground "green"))
+  (((min-colors 64)) :foreground "#ddffdd" :background "#335533")
+  (((class color)) :foreground "green"))

 (mdw-define-face magit-diff-added-highlight
 (mdw-define-face magit-diff-added-highlight

-  (((class color) (type x)) :foreground "#cceecc" :background "#336633")
-  (((class color) (type tty)) :foreground "green" :background "blue"))
+  (((min-colors 64)) :foreground "#cceecc" :background "#336633")
+  (((class color)) :foreground "green" :background "blue"))

 (mdw-define-face magit-diff-removed
 (mdw-define-face magit-diff-removed

-  (((class color) (type x)) :foreground "#ffdddd" :background "#553333")
-  (((class color) (type tty)) :foreground "red"))
+  (((min-colors 64)) :foreground "#ffdddd" :background "#553333")
+  (((class color)) :foreground "red"))

 (mdw-define-face magit-diff-removed-highlight
 (mdw-define-face magit-diff-removed-highlight

-  (((class color) (type x)) :foreground "#eecccc" :background "#663333")
-  (((class color) (type tty)) :foreground "red" :background "blue"))
+  (((min-colors 64)) :foreground "#eecccc" :background "#663333")
+  (((class color)) :foreground "red" :background "blue"))

 
 (mdw-define-face dylan-header-background
 
 (mdw-define-face dylan-header-background

-  (((class color) (type x)) :background "NavyBlue")
-  (t :background "blue"))
+  (((min-colors 64)) :background "NavyBlue")
+  (((class color)) :background "blue"))

 
 (mdw-define-face erc-input-face
   (t :foreground "red"))
 
 (mdw-define-face erc-input-face
   (t :foreground "red"))