From: Mark Wooding <mdw@distorted.org.uk>
Date: Sat, 7 Mar 2009 14:49:29 +0000 (+0000)
Subject: Merge commit 'ponder/master'
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/150acf6735d16c63bf3eef6a1ac4ab4cbc4a0ba7?hp=-c

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

150acf6735d16c63bf3eef6a1ac4ab4cbc4a0ba7
diff --combined emacs
index f1bbfb0,6e9201a..dcb561d
--- a/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]