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 39a742cc85d1b0535f3d4d9ae7d34e1f4dff79c3..38c9cee4fab1b0e4065ddf5238e6f9136330e8b5 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -19,7 +19,8 @@
 (setq read-file-name-completion-ignore-case t)
 (tool-bar-mode nil)
 
-(global-set-key "\C-\\" 'toggle-input-method)
+(global-set-key (kbd "C-\\" ) 'toggle-input-method)
+(global-set-key (kbd "C-RET") 'completion-at-point)
 
 (unless window-system
   (normal-erase-is-backspace-mode t))
@@ -350,7 +351,6 @@
 (setq cperl-indent-parens-as-block t)
 
 ;; Erlang
-(add-to-list 'load-path "/usr/pkg/lib/erlang/lib/tools-2.6/emacs")
 (require-if-present 'erlang-start)
 (setq erlang-electric-commands nil)
 
@@ -376,6 +376,7 @@
 
 ;; migemo
 (require-if-present 'migemo)
+(setq migemo-isearch-enable-p nil)
 
 ;; tiarra-conf
 (setq load-path (cons (expand-file-name "~/sandbox/Tiarra") load-path))
@@ -492,8 +493,6 @@
  '(ecb-tree-buffer-style (quote ascii-guides))
  '(ecb-windows-width 0.2)
  '(elscreen-display-tab t)
- '(font-lock-global-modes (quote (not mew-summary-mode)))
- '(global-whitespace-mode t)
  '(haskell-program-name "ghci")
  '(ido-enable-flex-matching t)
  '(ido-everywhere t)