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/emacs b/dot/emacs
index 0aa459171a73652090b036a2e44af58bb08c863a..5aa89189ae0f2b5bc9c406d26d3a7834ab1cd4af 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -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)