Auto commit by The Sugar System.

[sugar.git] / dot-files / _emacs_el

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index e8508e6620220a91c1a19bd937ec846d4de348f1..51180d719596504afe2e12743366806868b9e82d 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -21,6 +21,7 @@
 
 (global-set-key (kbd "C-\\" ) 'toggle-input-method)
 (global-set-key (kbd "C-RET") 'completion-at-point)
+(global-set-key (kbd "C-<return>") 'completion-at-point)
 
 (unless window-system
   (normal-erase-is-backspace-mode t))
@@ -141,6 +142,11 @@
       (color-theme-initialize)
       (color-theme-subtle-hacker)))
 
+;; multi-term
+(autoload 'multi-term "multi-term"
+  "Create new term buffer.
+Will prompt you shell name when you type `C-u' before this command." t)
+
 ;; auto-complete
 (require-if-present 'auto-complete-config)
 (if (featurep 'auto-complete-config)