completion stuff

git-svn-id: file:///svn/tfheen/trunk/dotfiles@159 8da78d58-1cd3-0310-bee5-d77bd1b3e8bf

diff --git a/emacs b/emacs
index bb1c3c4d2a9641efe2123fddb0800a91bf913313..bffac112b24ea93081e6fdc8d4e08627bbd4dada 100644 (file)
--- a/emacs
+++ b/emacs
@@ -201,8 +201,15 @@
  (global-set-key [end] 'end-of-buffer)
  (setq cursor-in-non-selected-windows nil))
 
+(defun tfheen-complete (&optional x)
+  (interactive)
+  (if (eq major-mode 'jde-mode)
+      (jde-complete-at-point)
+    (hippie-expand x)))
+
 (global-set-key [C-tab] 'dabbrev-expand)
-(global-set-key [M-space] '(lambda() (insert " ")))
+(global-set-key "\M- " 'tfheen-complete)
+
 
 ;(add-hook 'diary-hook 'appt-make-list)
 ;(add-hook 'diary-hook 'appt-make-list)