修改默认字体

llmplusplus · llmplusplus · commit 88f8d5bcd178 · 2017-02-15T14:06:07.000+08:00
diff --git a/init.el b/init.el
@@ -20,9 +20,9 @@
 (require 'init-core)
 
 (require 'init-theme)
-(require 'init-editor)
 (require 'init-frame)
 (require 'init-window)
+(require 'init-editor)
 
 (require 'init-evil)
 (require 'init-dired)
diff --git a/lisp/init-editor.el b/lisp/init-editor.el
@@ -31,27 +31,13 @@
       (setq linum-format "%4d ")
       )
   )
+
 ;; 成对插入括号
 (electric-pair-mode 1)
+
 ;; 高亮匹配的括号
 (show-paren-mode 1)
 
-(config-after-fetch-require 'default-text-scale
-  ;; 字体大小调整
-  (set-default-font "Menlo 13")
-  (when window-system
-    (global-set-key (kbd "C-M-=") 'default-text-scale-increase)
-    (global-set-key (kbd "C-M--") 'default-text-scale-decrease)
-    (config-add-hook 'visual-fill-column-mode-hook
-      ;; 自动适配列数
-      (if visual-fill-column-mode
-          (add-hook 'after-setting-font-hook 'visual-fill-column--adjust-window nil t)
-        (remove-hook 'after-setting-font-hook 'visual-fill-column--adjust-window t)
-	)
-      )
-    )
-  )
-
 (config-after-require 'autorevert
   ;; 不断监听当前buffer变化，如果其它编辑器同时修改该文件，修改会同步过来
   (global-auto-revert-mode t)
diff --git a/lisp/init-frame.el b/lisp/init-frame.el
@@ -14,6 +14,28 @@
   ;; 设置窗口标题格式
   (setq frame-title-format '(:eval (if (buffer-file-name) (abbreviate-file-name (buffer-file-name)) "%b")))
 
+  (if *is-frame*
+      ;; 设置默认字体
+      (if (eq system-type 'darwin)
+  	  (add-to-list 'default-frame-alist '(font . "Menlo 13"))
+  	)
+    )
+
+  (config-after-fetch-require 'default-text-scale
+    ;; 字体大小调整
+    (when window-system
+      (global-set-key (kbd "C-M-=") 'default-text-scale-increase)
+      (global-set-key (kbd "C-M--") 'default-text-scale-decrease)
+      (config-add-hook 'visual-fill-column-mode-hook
+	;; 自动适配列数
+	(if visual-fill-column-mode
+	    (add-hook 'after-setting-font-hook 'visual-fill-column--adjust-window nil t)
+	  (remove-hook 'after-setting-font-hook 'visual-fill-column--adjust-window t)
+	  )
+	)
+      )
+    )
+
   (config-add-hook 'after-make-console-frame-hooks
     ;; 控制台下 C-<方向键> 修复
     (let ((map (if (boundp 'input-decode-map) input-decode-map function-key-map)))
