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 4ff68969740a0458016604fd187a5717bb24fcce..1858c33fc04aa3cd6b8aaf08a73f1dc60d84d874 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -50,11 +50,14 @@
 
 ;; Setting for Frames ----------------------------------------------------------
 (when window-system
-  (set-default-font "Inconsolata-14")
-  (set-face-font 'variable-pitch "Inconsolata-14")
-  (set-fontset-font (frame-parameter nil 'font)
-                    'japanese-jisx0208
-                    '("Takaoゴシック" . "unicode-bmp")))
+  (set-default-font "Dejavu Sans Mono 13"))
+
+;(when window-system
+;  (set-default-font "Inconsolata-14")
+;  (set-face-font 'variable-pitch "Inconsolata-14")
+;  (set-fontset-font (frame-parameter nil 'font)
+;                    'japanese-jisx0208
+;                    '("Takaoゴシック" . "unicode-bmp")))
 
 ;(when window-system
 ;  (add-to-list 'default-frame-alist
@@ -121,7 +124,10 @@
       (mapcar (lambda (mode)
                 (add-to-list 'ac-modes mode))
               '(autoconf-mode
-                erlang-mode))
+                erlang-mode
+                haskell-mode
+                haskell-cabal-mode))
+      (setq ac-modes (remove 'css-mode ac-modes))
       (add-hook 'erlang-mode-hook
                 (lambda ()
                   (add-to-list 'ac-sources 'ac-source-semantic)))