Auto commit by The Sugar System.

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index 26ee810616136c42330956572321abae9ba3fab7..ea2605a238a2651cfe1d32bfe54dd17f2e98c5ea 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -66,24 +66,15 @@
 
 ;; Setting for Frames ----------------------------------------------------------
 (when window-system
-  (if (equal (system-name) "seras")
-      (set-default-font "Dejavu Sans Mono 11")
-    (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
-;               '(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")))
+  (let ((host (system-name)))
+    (cond ((equal host "seras")
+           (set-frame-font "Dejavu Sans Mono 11" t))
+
+          ((equal host "aria.cielonegro.org")
+           (progn
+             (set-frame-font "Dejavu Sans Mono 13" t)
+             (set-fontset-font nil 'japanese-jisx0208 "さざなみゴシック")
+             (set-fontset-font nil 'japanese-jisx0212 "さざなみゴシック"))))))
 
 ;; Hooks for newline-and-indent ------------------------------------------------
 ;(mapcar (lambda (hook)