Merge remote branch 'ponder'

* ponder:
  dot/Xdefaults: Add more Xft settings.
  el/dot-emacs.el: Configure dired faces.
  el/dot-emacs.el: Don't turn on outline-minor-mode all the time.
  dot/emacs: Remove lots of minor-mode verbiage.

diff --git a/dot/Xdefaults b/dot/Xdefaults
index 87c40ba8b42133397d8294406dd54e10bad2d283..2952699257daa5d2f03f8533f38615ef52db8f40 100644 (file)
--- a/dot/Xdefaults
+++ b/dot/Xdefaults
@@ -21,6 +21,9 @@
 !! Xft settings.
 Xft.dpi:                       75
 Xft.hintstyle:                 hintslight
+Xft.hinting:                   true
+Xft.antialias:                 true
+Xft.rgba:                      none
 
 !! Xcursor settings.
 Xcursor.size:                  24

diff --git a/dot/emacs b/dot/emacs
index 2a5522d96e718fefd963cff39e3aa612de2a5ef3..5aa89189ae0f2b5bc9c406d26d3a7834ab1cd4af 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -481,6 +481,18 @@
       (org-remember-insinuate)
       (global-set-key [?\C-c ?r] 'org-remember)))
 
+;; Minor mode listing
+
+(setq minor-mode-alist
+      (mdw-uniquify-alist '((reveal-mode (hs-minor-mode
+                                         " hs/r"
+                                         (global-reveal-mode
+                                          "" " Reveal")))
+                           (hs-minor-mode (reveal-mode "" " hs"))
+                           (abbrev-mode "")
+                           (gtags-mode ""))
+                         minor-mode-alist))
+
 ;; Recognising types of files.
 
 (setq auto-mode-alist

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 4cca329c3c9fab068e604915b1ba22538a8dd4d2..3372556f7024075de65c9bc07727e4b5285cef18 100644 (file)
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -746,8 +746,9 @@ (defun mdw-misc-mode-config ()
   (mdw-whitespace-mode 1)
   (and (fboundp 'gtags-mode)
        (gtags-mode))
-  (outline-minor-mode t)
-  (hs-minor-mode t)
+  (if (fboundp 'hs-minor-mode)
+      (hs-minor-mode t)
+    (outline-minor-mode t))
   (reveal-mode t)
   (trap (turn-on-font-lock)))
 
@@ -865,6 +866,13 @@ (mdw-define-face comint-highlight-prompt
 (mdw-define-face comint-highlight-input
   (t nil))
 
+(mdw-define-face dired-directory
+  (t :foreground "cyan" :weight bold))
+(mdw-define-face dired-symlink
+  (t :foreground "cyan"))
+(mdw-define-face dired-perm-write
+  (t nil))
+
 (mdw-define-face trailing-whitespace
   (((class color)) :background "red")
   (t :inverse-video t))