Auto commit by The Sugar System.

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index 34b7454ccf425af97a8a65fba7a9098258a32d50..bdf6fd17990e438fc62162090b66214f056ab5aa 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -119,26 +119,6 @@
              ;;(set-fontset-font nil 'katakana-jisx0201 "さざなみゴシック")
              )))))
 
-;; Hooks for newline-and-indent ------------------------------------------------
-;(mapcar (lambda (hook)
-;     (add-hook hook
-;           (lambda ()
-;             (local-set-key "\C-m" 'newline-and-indent)
-;             (local-set-key "\C-j" 'newline)
-;             )))
-;   '(perl-mode-hook
-;     cperl-mode-hook
-;     java-mode-hook
-;     javascript-mode-hook
-;     c-mode-hook
-;     c++-mode-hook
-;     objc-mode-hook
-;     emacs-lisp-mode-hook
-;     lisp-mode-hook
-;     yatex-mode-hook
-;     css-mode-hook
-;     scheme-mode-hook))
-
 ;; Setting for Packages --------------------------------------------------------
 (defun require-if-present (feature)
   (condition-case e
@@ -606,6 +586,7 @@ Will prompt you shell name when you type `C-u' before this command." t)
  '(ecb-tip-of-the-day nil)
  '(ecb-tree-buffer-style (quote ascii-guides))
  '(ecb-windows-width 0.2)
+ '(electric-indent-mode nil)
  '(elscreen-display-tab t)
  '(global-whitespace-mode t)
  '(graphviz-dot-auto-indent-on-newline nil)