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 --combined dot/emacs
index 2a5522d96e718fefd963cff39e3aa612de2a5ef3,0aa459171a73652090b036a2e44af58bb08c863a..5aa89189ae0f2b5bc9c406d26d3a7834ab1cd4af
--- 1/dot/emacs
--- 2/dot/emacs
+++ b/dot/emacs
@@@ -481,6 -481,18 +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
@@@ -774,7 -786,7 +786,7 @@@
  (setq shell-prompt-pattern "^[^]#$%>»}\n]*\\([]#$%»}]\\|>>?\\) *")
  (setq comint-password-prompt-regexp
        (concat "\\(\\([Ee]nter \\|[Oo]ld \\|[Nn]ew \\|[a-zA-Z0-9_]*'s \\|^\\)"
 -            "[Pp]assword\\|pass phrase\\):")
 +            "[Pp]assword\\|[Pp]ass ?phrase\\(\\| [-a-zA-Z0-9._]+\\)\\):")
        comint-file-name-chars "~/A-Za-z0-9+@:_.$#%,={}-"
        shell-file-name-chars comint-file-name-chars)