Merge remote branch 'crybaby'

* crybaby:
  dot/emacs: Turn off Senator again.
  el/dot-emacs.el: Don't use a fancy face for `which-func'.

diff --git a/dot/emacs b/dot/emacs
index 3dc2377d3d3363c723d05a8e0ac06173d3e82bb0..29974a64b9f2df8137143547518d794bf8b11140 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -62,7 +62,7 @@
 
 (trap (or mdw-fast-startup (require 'tex-site)))
 
-(trap (or mdw-fast-startup (semantic-load-enable-excessive-code-helpers)))
+(trap (or mdw-fast-startup t (semantic-load-enable-code-helpers)))
 (setq semanticdb-default-save-directory "~/.emacs.d/semanticdb/")
 (eval-after-load "senator"
   '(setq isearch-mode-hook

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 08cc3def997fa881c1871d9da1b825cbb76436b6..4cca329c3c9fab068e604915b1ba22538a8dd4d2 100644 (file)
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -922,6 +922,8 @@   (default :weight bold)
   (((type tty)) :foreground "green") (t :foreground "SeaGreen1"))
 (mdw-define-face message-header-name
   (((type tty)) :foreground "green") (t :foreground "SeaGreen1"))
+(mdw-define-face which-func
+  (t nil))
 
 (mdw-define-face diff-index
   (t :weight bold))