From 03fe4ca3c2afdbeb973c9d9c0afeed2b55fd212a Mon Sep 17 00:00:00 2001
From: Peng Li <seudut@gmail.com>
Date: Sat, 12 Sep 2015 16:11:03 +0800
Subject: [PATCH] emacs - mult-term fix chinese font

---
 emacs.d/config/init-base.el        |  5 ++++-
 emacs.d/config/init-evil.el        | 10 ++++++----
 emacs.d/config/init-key-binding.el |  5 -----
 emacs.d/config/init-multi-term.el  | 11 +++++++++--
 emacs.d/init.el                    |  4 ----
 zsh/zshrc                          |  2 ++
 6 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/emacs.d/config/init-base.el b/emacs.d/config/init-base.el
index 00fa25b..6773f70 100644
--- a/emacs.d/config/init-base.el
+++ b/emacs.d/config/init-base.el
@@ -29,8 +29,11 @@
 
 (set-face-attribute 'vertical-border nil  :foreground "gray")
 
+(defalias 'yes-or-no-p 'y-or-n-p)
 
-
+(setq scroll-margin 5)
+(setq scroll-conservatively 10000)
+(show-paren-mode t)
 
 
 (provide 'init-base)
diff --git a/emacs.d/config/init-evil.el b/emacs.d/config/init-evil.el
index 00dadb9..00dd991 100644
--- a/emacs.d/config/init-evil.el
+++ b/emacs.d/config/init-evil.el
@@ -22,12 +22,16 @@
 (define-key evil-normal-state-map "\C-j" nil)
 (define-key evil-normal-state-map "\C-o" nil)
 
+
+
+
 ;; M-e not works correctly in evil-normal mode, this fix it
 (define-key evil-normal-state-map "\M-e" (lambda() (interactive)
 					   (forward-sentence 2)))
-
 (define-key evil-motion-state-map "\C-e" (move-end-of-line 1))
 
+
+
 (global-evil-leader-mode)
 (evil-leader/set-leader "s")
 (evil-leader/set-key "j" 'helm-mini)
@@ -41,7 +45,6 @@
 (key-chord-define evil-normal-state-map ";w" 'save-buffer)
 (key-chord-define evil-normal-state-map ";s" 'split-window-below)
 (key-chord-define evil-normal-state-map ";v" 'split-window-right)
-
 (key-chord-define evil-normal-state-map ";;" 'helm-find-files)
 
 (key-chord-mode 1)
@@ -57,8 +60,7 @@
 
 
 ;; cursor shape
-;(setq evil-emacs-state-cursor '("red" box))
-(setq evil-emacs-state-cursor '("red" bar))
+(setq evil-emacs-state-cursor '("red" box))
 (setq evil-normal-state-cursor '("green" box))
 (setq evil-visual-state-cursor '("orange" box))
 (setq evil-insert-state-cursor '("red" bar))
diff --git a/emacs.d/config/init-key-binding.el b/emacs.d/config/init-key-binding.el
index d4a43fb..b6bad3d 100644
--- a/emacs.d/config/init-key-binding.el
+++ b/emacs.d/config/init-key-binding.el
@@ -32,11 +32,6 @@
 ;(key-chord-define-global "sj" 'helm-mini)
 ;(key-chord-define-global "sk" 'helm-find-files)
 
-;(key-chord-define-global ";w" 'save-buffer)
-;(key-chord-define-global ";s" 'split-window-below)
-;(key-chord-define-global ";v" 'split-window-right)
-;(key-chord-define-global ";q" 'delete-window)
-
 
 (key-chord-define-global "JJ" 'save-buffer)
 (key-chord-define-global "HH" 'save-buffer)
diff --git a/emacs.d/config/init-multi-term.el b/emacs.d/config/init-multi-term.el
index 11f9ac6..8fdd9e2 100644
--- a/emacs.d/config/init-multi-term.el
+++ b/emacs.d/config/init-multi-term.el
@@ -7,10 +7,17 @@
 (require 'multi-term)
 
 (setq multi-term-program "/bin/zsh")
-
+(setq system-uses-terminfo nil)
 
 (add-hook 'term-mode-hook
           (lambda ()
-	    (linum-mode nil)))
+	    (linum-mode -1)
+	    (highlight-current-line-on nil)))
+
+
+(add-to-list 'term-bind-key-alist '("C-c C-n" . multi-term-next))
+(add-to-list 'term-bind-key-alist '("C-c C-p" . multi-term-prev))
+(add-to-list 'term-bind-key-alist '("C-c C-j" . term-line-mode))
+(add-to-list 'term-bind-key-alist '("C-c C-k" . term-char-mode))
 
 (provide 'init-multi-term)
diff --git a/emacs.d/init.el b/emacs.d/init.el
index 2d0350b..5b5cc98 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -20,10 +20,6 @@
 (require 'init-project)
 (require 'init-ggtags)
 
-(setq scroll-margin 5)
-(setq scroll-conservatively 10000)
-(show-paren-mode t)
-
 
 ;;;; conflict with C-c . in org-mode, disable it temporarily
 ;;;;(require 'init-c-cpp)
diff --git a/zsh/zshrc b/zsh/zshrc
index b0e3857..9b3fd68 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -213,3 +213,5 @@ export ZSHHOME="$HOME/.zsh"
 alias emacs='TERM=xterm-256color emacs -nw'
 
 alias tw='open -a /Applications/TextWrangler.app/'
+export LANG='en_US.UTF-8'
+export LC_ALL="en_US.UTF-8"
-- 
2.11.0