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 --git a/emacs b/emacs
index f1bbfb01b35e9771237e36b2ba5377bf7ee1425f..dcb561d4c6fcaa2676b8ef5dc5334a0da476972a 100644 (file)
--- a/emacs
+++ b/emacs
@@ -60,6 +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)))
@@ -398,6 +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]