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 1fb7d2ec9ddd3e59bbdd4dd9e497b0b22c037952..aca5f405819f15799480863e3b320a72327b67db 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -46,31 +46,31 @@
 ;; Setting for Frames ----------------------------------------------------------
 (when window-system
   (add-to-list 'default-frame-alist
-               '(font . "Bitstream Vera Sans Mono 11"))
-  (set-frame-font "Bitstream Vera Sans Mono 11")
+               '(font . "Bitstream Vera Sans Mono 12"))
+  (set-frame-font "Bitstream Vera Sans Mono 12")
   (set-fontset-font nil;(frame-parameter nil 'font)
                     'japanese-jisx0208
                     '("Hiragino Kaku Gothic Pro W3" . "unicode-bmp")))
 
 ;; 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))
+;(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)
@@ -103,7 +103,7 @@
 ;; mic-paren
 (require-if-present 'mic-paren)
 (if (featurep 'mic-paren)
-       (paren-activate))
+    (paren-activate))
 
 ;; elscreen
 (load "elscreen" "ElScreen" t)
@@ -119,6 +119,10 @@
       (append '(("\\.rst$" . rst-mode)
                 ("\\.rest$" . rst-mode)) auto-mode-alist))
 
+;; lua-mode
+(autoload 'lua-mode "lua-mode" "Lua editing mode." t)
+(add-to-list 'auto-mode-alist '("\\.lua$" . lua-mode) auto-mode-alist)
+
 ;; twittering-mode
 (require-if-present 'twittering-mode)
 (setq twittering-username "phonohawk")
@@ -246,12 +250,12 @@
 
 ;; c-mode
 (mapcar (lambda (hook)
-         (add-hook hook
-                   (lambda () (c-set-style "user"))))
-       '(c-mode-hook
-         c++-mode-hook
-         objc-mode-hook
-         java-mode-hook))
+      (add-hook hook
+            (lambda () (c-set-style "user"))))
+    '(c-mode-hook
+      c++-mode-hook
+      objc-mode-hook
+      java-mode-hook))
 
 ;; css
 (autoload 'css-mode "css-mode" "For editing CSS file" t)
@@ -275,6 +279,7 @@
 ;; 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)
 
 ;; SKK
 (require 'skk-autoloads)
@@ -392,7 +397,6 @@
  '(jabber-username "phonohawk")
  '(jaspace-highlight-tabs t)
  '(js2-basic-offset 4)
- '(js2-indent-on-enter-key t)
  '(js2-use-font-lock-faces t)
  '(mew-field-spec (quote (("^Resent-\\(From\\|To\\|Cc\\|Date\\)" t mew-face-header-important mew-face-header-important) ("^Subject:$" t mew-face-header-important mew-face-header-subject) ("^From:$" t mew-face-header-important mew-face-header-from) ("^\\(To\\|Apparently-To\\):$" t mew-face-header-important mew-face-header-to) ("^\\(Cc\\|Dcc\\|Bcc\\):$" t mew-face-header-important mew-face-header-to) ("^Newsgroups:$" t mew-face-header-important mew-face-header-to) ("^Date:$" t mew-face-header-important mew-face-header-date) ("^Reply-To:$" t) ("^X-Mailer:$" t) ("^X-Mew:$" t mew-face-header-important mew-face-header-xmew) ("^\\(Received\\|Return-Path\\|Sender\\|Errors-To\\):$" nil) ("^\\(Path\\|Distribution\\|Xref\\):$" nil) ("^NNTP-Posting-" nil) ("^\\(Message-Id\\|Posted\\|In-Reply-To\\|References\\|Precedence\\):$" nil) ("^Delivered-" nil) ("^List-" nil) ("^\\(Mime-Version\\|Lines\\):$" nil) ("^From$" nil) ("^Status:$" nil) ("^Face:$" nil mew-face-header-private mew-face-header-marginal) ("^X-Text-Classification:$" t mew-face-header-important mew-face-header-important) ("^X-POPFile-Link:$" t mew-face-header-important mew-face-body-url) ("^\\(X\\|Original\\)-" nil mew-face-header-private mew-face-header-marginal))))
  '(mew-refile-guess-alist (quote (("From:" ("noreply@adc1.apple.com" . "+mm/adc") ("mag2 ID 0000022139" . "+mm/2ch") ("noreply@sourceforge.net" . "+from/sf-net")) ("Subject:" ("w3m-dev" . "+ml/w3m-dev")) ("To:" ("glasgow-haskell-users@haskell.org" . "+ml/ghc-users") ("fink-devel@lists.sourceforge.net" . "+ml/fink-devel")) ("Reply-To:" ("yun@kokonoe.com" . "+mm/kokonoe")) ("Cc:" ("glasgow-haskell-users@haskell.org" . "+ml/ghc-users")))))