From 6ce52a6b004f4350d118c84615a2c8675a4a4e5a Mon Sep 17 00:00:00 2001
From: Peng Li <seudut@gmail.com>
Date: Sun, 20 Dec 2015 17:30:47 +0800
Subject: [PATCH] change emacs color theme - cont.

---
 emacs.d/config/init-base.el   |  4 +++
 emacs.d/config/init-eshell.el |  4 +++
 emacs.d/config/init-font.el   |  1 -
 emacs.d/custom.el             | 63 -------------------------------------------
 emacs.d/init.el               |  1 +
 5 files changed, 9 insertions(+), 64 deletions(-)
 delete mode 100644 emacs.d/custom.el

diff --git a/emacs.d/config/init-base.el b/emacs.d/config/init-base.el
index 7ee68e4..47e4922 100644
--- a/emacs.d/config/init-base.el
+++ b/emacs.d/config/init-base.el
@@ -17,6 +17,10 @@
 (setq resize-mini-windows t)
 (blink-cursor-mode 0)
 
+;(custom-set-variables
+; '(fringe-mode (quote (0 . 0)) nil (fringe)))
+
+(fringe-mode (quote (0 . 0)))
 
 (add-to-list 'auto-mode-alist '("emacs\\'" . emacs-lisp-mode))
 
diff --git a/emacs.d/config/init-eshell.el b/emacs.d/config/init-eshell.el
index 43df27b..0193ee7 100644
--- a/emacs.d/config/init-eshell.el
+++ b/emacs.d/config/init-eshell.el
@@ -24,6 +24,7 @@
       (add-to-list 'eshell-visual-commands "ssh")
       (add-to-list 'eshell-visual-commands "tail")))
 
+; copied from howard's github
 (defun curr-dir-git-branch-string (pwd)
   "Returns current git branch as a string, or the empty string if
 PWD is not in a git repo (or the git command is not found)."
@@ -183,7 +184,10 @@ directory to make multiple eshell windows easier."
 
 
 
+;; alias
 
+(defalias 'e 'find-file)
+(defalias 'ee 'find-file-other-window)
 
 
 
diff --git a/emacs.d/config/init-font.el b/emacs.d/config/init-font.el
index 4fbf0a7..6ddf992 100644
--- a/emacs.d/config/init-font.el
+++ b/emacs.d/config/init-font.el
@@ -68,7 +68,6 @@
 
 (global-set-key (kbd "C-=") 'text-scale-increase)
 (global-set-key (kbd "C--") 'text-scale-decrease)
-(text-scale-adjust 2)
 
 
 
diff --git a/emacs.d/custom.el b/emacs.d/custom.el
deleted file mode 100644
index 020c36b..0000000
--- a/emacs.d/custom.el
+++ /dev/null
@@ -1,63 +0,0 @@
-(custom-set-variables
- ;; custom-set-variables was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- '(canlock-password "1bc544f0a4569648d0e50436801e01f4698a6c4c")
- '(fringe-mode (quote (4 . 0)) nil (fringe))
- '(ggtags-split-window-function (quote split-window-vertically))
- '(hes-mode-alist
-   (quote
-    ((c-mode . "\\(\\\\\\([0-7]\\{1,3\\}\\|x[[:xdigit:]]+\\|u[[:xdigit:]]\\{4\\}\\|U[[:xdigit:]]\\{8\\}\\|[\"'?\\abfnrtv]\\)\\)")
-     (cperl-mode . "\\(\\\\\\([0-7]\\{1,3\\}\\|x[[:xdigit:]]+\\|u[[:xdigit:]]\\{4\\}\\|U[[:xdigit:]]\\{8\\}\\|[\"'?\\abfnrtv]\\)\\)")
-     (c++-mode . "\\(\\\\\\([0-7]\\{1,3\\}\\|x[[:xdigit:]]+\\|u[[:xdigit:]]\\{4\\}\\|U[[:xdigit:]]\\{8\\}\\|[\"'?\\abfnrtv]\\)\\)")
-     (objc-mode . "\\(\\\\\\([0-7]\\{1,3\\}\\|x[[:xdigit:]]+\\|u[[:xdigit:]]\\{4\\}\\|U[[:xdigit:]]\\{8\\}\\|[\"'?\\abfnrtv]\\)\\)")
-     (java-mode . "\\(\\\\\\([0-7]\\{1,3\\}\\|u[[:xdigit:]]\\{4\\}\\|[\"'\\bfnrt]\\)\\)")
-     (js-mode . "\\(\\\\\\([0-7]\\{1,3\\}\\|x[[:xdigit:]]\\{2\\}\\|u[[:xdigit:]]\\{4\\}\\|.\\)\\)")
-     (js2-mode . "\\(\\\\\\([0-7]\\{1,3\\}\\|x[[:xdigit:]]\\{2\\}\\|u[[:xdigit:]]\\{4\\}\\|.\\)\\)")
-     (ruby-mode
-      ("\\(\\\\\\([0-7]\\{1,3\\}\\|x[[:xdigit:]]\\{1,2\\}\\|u\\(?:[[:xdigit:]]\\{4\\}\\|{[[:xdigit:]]\\{1,6\\}\\(?:[[:space:]]+[[:xdigit:]]\\{1,6\\}\\)*}\\)\\|.\\)\\)"
-       (0
-	(let*
-	    ((state
-	      (syntax-ppss))
-	     (term
-	      (nth 3 state)))
-	  (when
-	      (or
-	       (and
-		(eq term 39)
-		(member
-		 (match-string 2)
-		 (quote
-		  ("\\" "'"))))
-	       (if
-		   (fboundp
-		    (quote ruby-syntax-expansion-allowed-p))
-		   (ruby-syntax-expansion-allowed-p state)
-		 (memq term
-		       (quote
-			(34 47 10 96 t)))))
-	    (add-face-text-property
-	     (match-beginning 1)
-	     (match-end 1)
-	     (quote hes-escape-backslash-face))
-	    (add-face-text-property
-	     (match-beginning 2)
-	     (match-end 2)
-	     (quote hes-escape-sequence-face))
-	    nil))
-	prepend))))))
- '(org-agenda-files (quote ("~/Private/org/diary.org" "~/temp/org-note.org")))
- '(powerline-height 14)
- '(powerline-text-scale-factor 0.85))
-(custom-set-faces
- ;; custom-set-faces was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- '(highlight-current-line-face ((t (:background "gray22"))))
- '(linum ((t (:background "#000000" :foreground "gray40" :height 0.8 :slant italic :weigth light))))
- '(linum-relative-current-face ((t (:inherit linum :foreground "Yellow" :weight light :height 0.8))))
- '(mode-line ((t (:foreground "#030303" :background "#bdbdbd" :box nil :family "Source Code Pro for Powerline" :height 100))))
- '(mode-line-inactive ((t (:foreground "#f9f9f9" :background "#666666" :box nil :family "Source Code Pro for Powerline" :height 100)))))
diff --git a/emacs.d/init.el b/emacs.d/init.el
index a909f45..a37a1d9 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -195,3 +195,4 @@
 
 
 
+(fringe-mode (quote (0 . 0)))
-- 
2.11.0