X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Fconfig.org;h=569e1e3c2c27a83de8e4005bf1236e8a8d871792;hb=37c2e25acc3261f6aa74488e68eeeeb09cb53624;hp=e4c37cfbdbcbbcb6365df1ff884624f4da023460;hpb=c17a6dffd750cc9eb4474cfd04a3732382f30dc9;p=dotfiles.git

diff --git a/emacs.d/config.org b/emacs.d/config.org
index e4c37cf..569e1e3 100644
--- a/emacs.d/config.org
+++ b/emacs.d/config.org
@@ -169,12 +169,12 @@ Check out [[http://tapoueh.org/emacs/el-get.html][el-get]].
 #+END_SRC
 
 ** Font Setting
-syntax highlighting
+*** syntax highlighting
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
   (global-font-lock-mode 1)
 #+END_SRC
 
-[[https://github.com/i-tu/Hasklig][Hasklig]] and Source Code Pro, defined fonts family
+*** [[https://github.com/i-tu/Hasklig][Hasklig]] and Source Code Pro, defined fonts family
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
   (if window-system
       (defvar sd/fixed-font-family
@@ -194,21 +194,20 @@ Setting the fonts alignment issue
         (set-face-font 'default sd/fixed-font-family)))
 #+END_SRC
 
-Fix the font alignment issue when both Chinese and English hybird in org-mode table
+*** Chinese fonts
+Fix the font alignment issue when both Chinese and English hybird in org-mode table. Refer [[http://coldnew.github.io/blog/2013/11-16_d2f3a/][解決 org-mode 表格內中英文對齊的問題]]
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
   (defvar emacs-english-font "Source Code Pro" "The font name of English.")
 
-  ;; (defvar emacs-cjk-font "Hiragino Sans GB W3" "The font name for CJK.")
   (defvar emacs-cjk-font "STHeiti" "The font name for CJK.")
-  ;; (defvar emacs-cjk-font "chinese-gbk" "The font name for CJK.")
 
-  (defvar emacs-font-size-pair '(15 . 18) "Default font size pair for (english . chinese)")
+  (defvar emacs-font-size-pair '(13 . 16) "Default font size pair for (english . chinese)")
 
   (defvar emacs-font-size-pair-list
     '(( 5 .  6) (10 . 12)
-      (11 . 13) (12 . 14)
-      (13 . 16) (14 . 15) (15 . 18) (16 . 19) (17 . 20)
-      (18 . 21) (19 . 22) (20 . 24) (21 . 26)
+      (11 . 14) (12 . 14)
+      (13 . 16) (14 . 16) (15 . 18) (16 . 20) (17 . 20)
+      (18 . 22) (19 . 22) (20 . 24) (21 . 26)
       (24 . 28) (26 . 32) (28 . 34)
       (30 . 36) (34 . 40) (36 . 44))
     "This list is used to store matching (englis . chinese) font-size.")
@@ -221,18 +220,14 @@ Fix the font alignment issue when both Chinese and English hybird in org-mode ta
 
   (defun set-font (english chinese size-pair)
     "Setup emacs English and Chinese font on x window-system."
-
     (if (font-exist-p english)
         (set-frame-font (format "%s:pixelsize=%d" english (car size-pair)) t))
-
     (if (font-exist-p chinese)
-        (dolist (charset '(kana han symbol cjk-misc bopomofo))
+        (dolist (charset '(han cjk-misc) ;; '(kana han symbol cjk-misc bopomofo)
+                 )
           (set-fontset-font (frame-parameter nil 'font) charset
                             (font-spec :family chinese :size (cdr size-pair))))))
 
-  ;; Setup font size based on emacs-font-size-pair
-  ;; (set-font emacs-english-font emacs-cjk-font emacs-font-size-pair)
-
   (defun emacs-step-font-size (step)
     "Increase/Decrease emacs's font size."
     (let ((scale-steps emacs-font-size-pair-list))
@@ -251,9 +246,14 @@ Fix the font alignment issue when both Chinese and English hybird in org-mode ta
   (defun decrease-emacs-font-size ()
     "Increase emacs's font-size acording emacs-font-size-pair-list."
     (interactive) (emacs-step-font-size -1))
+#+END_SRC
 
-  ;; (global-set-key (kbd "C-=") 'increase-emacs-font-size)
-  ;; (global-set-key (kbd "C--") 'decrease-emacs-font-size)
+#+BEGIN_SRC emacs-lisp :tangle yes :results silent
+  ;; Setup font size based on emacs-font-size-pair
+  (set-font emacs-english-font emacs-cjk-font '(13 . 16))
+
+  ;; (global-set-key (kbd "s-=") 'increase-emacs-font-size)
+  ;; (global-set-key (kbd "s--") 'decrease-emacs-font-size)
 
 #+END_SRC
 
@@ -2875,7 +2875,7 @@ Most use =C-o C-o= to switch buffers; =C-o x, v= to split window; =C-o o= to del
     ;; Windows undo - redo
     ("u" (progn (winner-undo) (setq this-command 'winner-undo)) "undo")
     ("r" (progn (winner-redo) (setq this-command 'winner-redo)) "redo")
-    
+
     ;; ibuffer, dired, eshell, bookmarks
     ;; ("C-i" other-window nil :exit t)
     ("C-b" ido-switch-buffer nil :exit t)
@@ -2895,10 +2895,10 @@ Most use =C-o C-o= to switch buffers; =C-o x, v= to split window; =C-o o= to del
     ;; quit
     ("q" nil "cancel")
     ("<ESC>" nil)
-    ("C-h" nil nil :exit t)
-    ("C-j" nil nil :exit t)
-    ;; ("C-k" nil :exit t)
-    ("C-l" nil nil :exit t)
+    ("C-h" windmove-left nil :exit t)
+    ("C-j" windmove-down nil :exit t)
+    ("C-k" windmove-up :exit t)
+    ("C-l" windmove-right nil :exit t)
     ("C-;" nil nil :exit t)
     ("n" nil nil :exit t)
     ("[" nil nil :exit t)