From: Mark Wooding <mdw@distorted.org.uk>
Date: Thu, 3 Jun 2010 20:25:21 +0000 (+0100)
Subject: Merge remote branch 'ponder'
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/be325acf70bdbded6d86aa491720d39657fd2e73?hp=-c

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.
---

be325acf70bdbded6d86aa491720d39657fd2e73
diff --combined dot/emacs
index 2a5522d,0aa4591..5aa8918
--- a/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)