From dfd10975ec8a6e231e1385309189b72688b25ed5 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Thu, 5 Mar 2009 15:24:16 +0000
Subject: [PATCH] emacs: Make M-/ do hippie-expand -- if not starting up
 quickly.

---
 emacs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/emacs b/emacs
index 496dd3b..6e9201a 100644
--- a/emacs
+++ b/emacs
@@ -399,6 +399,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]
-- 
2.11.0