Merge commit 'ponder/master'

* commit 'ponder/master':
  emacs: Make M-/ do hippie-expand -- if not starting up quickly.
  emacs: Enable semantic hackery if we're not meant to start quickly.

diff --combined emacs
index f1bbfb01b35e9771237e36b2ba5377bf7ee1425f,6e9201a7e7c2633842479340a4a9697c95e8f646..dcb561d4c6fcaa2676b8ef5dc5334a0da476972a
--- 1/emacs
--- 2/emacs
+++ b/emacs
@@@ -60,6 -60,8 +60,8 @@@
  
  (trap (or mdw-fast-startup (require 'tex-site)))
  
+ (trap (or mdw-fast-startup (semantic-load-enable-excessive-code-helpers)))
+ 
  ;; --- Skeleton stuff ---
  
  (trap (or mdw-fast-startup (require 'skel-init)))
@@@ -119,7 -121,6 +121,7 @@@
  (setq sendmail-program "~/bin/sendmail-hack")
  
  (setq mail-user-agent 'message-user-agent)
 +(setq message-signature-separator "^-- \\(\\|\\[mdw\\]\\)$")
  
  (and (fboundp 'turn-on-gnus-dired-mode)
       (not mdw-fast-startup)
@@@ -398,6 -399,8 +400,8 @@@
                'mouse-drag-vertical-line)
  (global-set-key [vertical-scroll-bar C-mouse-1]
                #'(lambda () (interactive)))
+ (and (not mdw-fast-startup) (fboundp 'hippie-expand)
+      (global-set-key [?\M-/] 'hippie-expand))
  
  (defun mdw-clobber-org-mode-map ()
    (dolist (key '([S-up] [S-down] [S-left] [S-right]