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..519d9c8042a62fce18e4f32bffa261a48e8a4d56 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))
@@ -191,6 +192,11 @@
       (append '(("\\.rst$" . rst-mode)
                 ("\\.rest$" . rst-mode)) auto-mode-alist))
 
+;; textile-mode
+(autoload 'textile-mode "textile-mode"
+  "Major mode for editing Textile documents." t)
+(add-to-list 'auto-mode-alist '("\\.textile\\'" . textile-mode))
+
 ;; xsltxt-mode
 (autoload 'xsltxt-mode "xsltxt-mode" "Major mode for xsltxt." t)
 (add-to-list 'auto-mode-alist '("\\.xsltxt$" . xsltxt-mode))
@@ -350,7 +356,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 +381,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 +498,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)
@@ -571,6 +575,9 @@
  '(navi2ch-bm-new-unread-face ((t (:foreground "PaleGreen" :weight bold))))
  '(navi2ch-bm-updated-cache-face ((t (:foreground "CornflowerBlue" :weight bold))))
  '(navi2ch-bm-updated-unread-face ((t (:foreground "DarkSeaGreen3" :weight bold))))
+ '(textile-link-face ((t (:foreground "cyan"))))
+ '(textile-ol-bullet-face ((t (:foreground "dark orange"))))
+ '(textile-ul-bullet-face ((t (:foreground "deep sky blue"))))
  '(which-func-face ((t (:background "black" :foreground "dark orange"))))
  '(whitespace-indentation ((t (:foreground "dimgray" :underline t))))
  '(whitespace-line ((t (:background "gray20")))))