Merge commit 'ponder'

* commit 'ponder':
  el/dot-emacs.el: Lots of face settings for monochrome terminals.
  dot/emacs: Remove frame background setting.
  dot/emacs: Expunge `quilt' support.
  dot/emacs: Fix tramp runes.

diff --git a/dot/emacs b/dot/emacs
index 59ac6bfb4b5892f17839e333296294e2af13001a..649eaafa96af8655e29b0f745b8b8774809c5ce1 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -54,10 +54,8 @@
 
 (and (library-exists-p "vc-git")
      (not (memq 'GIT vc-handled-backends))
+     (not (memq 'Git vc-handled-backends))
      (setq vc-handled-backends (cons 'GIT vc-handled-backends)))
-(and (library-exists-p "quilt")
-     (not mdw-fast-startup)
-     (load "quilt"))
 
 (trap (or mdw-fast-startup (require 'p4)))
 
@@ -372,15 +370,12 @@
         (scroll-bar-width . 15)
         (cursor-color . "red"))
        (if mdw-black-background
-          '((background-color . "black")
-            (foreground-color . "white")
-            (background-mode . dark))
+          '((background-mode . dark))
         '((background-mode . light)))
        (and (eq window-system 'pm)
            '((font . "-os2-System VIO-medium-r-normal--*-40-*-*-m-*-cp850")
              (menu-font . "8.Helv")
              (background-color . "lightgrey")))
-       '((transparency . t))
        default-frame-alist))
 
 ;; Other frame fiddling.
@@ -523,12 +518,13 @@
               (tramp-copy-program nil)
               (tramp-copy-args nil)
               (tramp-copy-keep-date-arg nil)
-              (tramp-login-args ("TERM=dumb" "%u")))
+              (tramp-login-args (("TERM=dumb" "%u"))))
              ("really"
               (tramp-connection-function tramp-open-connection-su)
               (tramp-login-program "really")
-              (tramp-login-args ("-u" "%u" "--"
-                                 "env" "TERM=dumb" "/bin/sh"))
+              (tramp-login-args (("-u" "%u")
+                                 ("--")
+                                 ("env" "TERM=dumb" "/bin/sh")))
               (tramp-copy-program nil)
               (tramp-copy-args nil)
               (tramp-copy-keep-date-arg nil)

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index f4cfadb8e9d08f610ff725565e2e63b978289a2f..5cfc34b22c19962c0fc24b28e6ddee37f3376e87 100644 (file)
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -754,7 +754,8 @@      (defvar ,name ',name)
 (mdw-define-face default
   (((type w32)) :family "courier new" :height 85)
   (((type x)) :family "6x13" :height 130)
-  (t :foreground "white" :background "black"))
+  (((type color)) :foreground "white" :background "black")
+  (t nil))
 (mdw-define-face fixed-pitch
   (((type w32)) :family "courier new" :height 85)
   (((type x)) :family "6x13" :height 130)
@@ -765,25 +766,32 @@ (if (>= emacs-major-version 23)
   (mdw-define-face variable-pitch
     (((type x)) :family "helvetica" :height 120)))
 (mdw-define-face region
-  (((type tty)) :background "blue") (t :background "grey30"))
+  (((type tty) (class color)) :background "blue")
+  (((type tty) (class mono)) :inverse-video t)
+  (t :background "grey30"))
 (mdw-define-face minibuffer-prompt
   (t :weight bold))
 (mdw-define-face mode-line
-  (t :foreground "blue" :background "yellow"
-     :box (:line-width 1 :style released-button)))
+  (((class color)) :foreground "blue" :background "yellow"
+                  :box (:line-width 1 :style released-button))
+  (t :inverse-video t))
 (mdw-define-face mode-line-inactive
-  (t :foreground "yellow" :background "blue"
-     :box (:line-width 1 :style released-button)))
+  (((class color)) :foreground "yellow" :background "blue"
+                  :box (:line-width 1 :style released-button))
+  (t :inverse-video t))
 (mdw-define-face scroll-bar
   (t :foreground "black" :background "lightgrey"))
 (mdw-define-face fringe
   (t :foreground "yellow"))
 (mdw-define-face show-paren-match
-  (t :background "darkgreen"))
+  (((class color)) :background "darkgreen")
+  (t :underline t))
 (mdw-define-face show-paren-mismatch
-  (t :background "red"))
+  (((class color)) :background "red")
+  (t :inverse-video t))
 (mdw-define-face highlight
-  (t :background "DarkSeaGreen4"))
+  (((class color)) :background "DarkSeaGreen4")
+  (t :inverse-video t))
 
 (mdw-define-face holiday-face
   (t :background "red"))
@@ -792,11 +800,11 @@ (mdw-define-face calendar-today-face
 
 (mdw-define-face comint-highlight-prompt
   (t :weight bold))
-(mdw-define-face comint-highlight-input
-  (t :slant italic))
+(mdw-define-face comint-highlight-input)
 
 (mdw-define-face trailing-whitespace
-  (t :background "red"))
+  (((class color)) :background "red")
+  (t :inverse-video t))
 (mdw-define-face mdw-punct-face
   (((type tty)) :foreground "yellow") (t :foreground "burlywood2"))
 (mdw-define-face mdw-number-face
@@ -816,14 +824,16 @@ (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
-  (default :slant italic)
-  (((type tty)) :foreground "green") (t :foreground "SeaGreen1"))
+  (((class mono)) :weight bold)
+  (((type tty) (class color)) :foreground "green")
+  (t :slant italic :foreground "SeaGreen1"))
 (mdw-define-face font-lock-comment-face
-  (default :slant italic)
-  (((type tty)) :foreground "green") (t :foreground "SeaGreen1"))
+  (((class mono)) :weight bold)
+  (((type tty) (class color)) :foreground "green")
+  (t :slant italic :foreground "SeaGreen1"))
 (mdw-define-face font-lock-string-face
-  (t :foreground "SkyBlue1"))
-
+  (((class mono)) :weight bold)
+  (((class color)) :foreground "SkyBlue1"))
 (mdw-define-face message-separator
   (t :background "red" :foreground "white" :weight bold))
 (mdw-define-face message-cited-text