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 67c60cdf70f19a9a7507a65296872d9324381fab..d1eb1066feb449d93d028627de6b19a19904364c 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)