From dfdef82ccf5910f8efcde571f118da760cc63a23 Mon Sep 17 00:00:00 2001 From: Peng Li Date: Thu, 17 Sep 2015 19:59:20 +0800 Subject: [PATCH] emacs - magit related change --- emacs.d/config/init-evil.el | 1 + zsh/zshrc | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/emacs.d/config/init-evil.el b/emacs.d/config/init-evil.el index 5067725..b920d8f 100644 --- a/emacs.d/config/init-evil.el +++ b/emacs.d/config/init-evil.el @@ -86,6 +86,7 @@ (magit-popup-mode . emacs) (rdictcc-buffer-mode . emacs) (dired-mode . emacs) + (text-mode . emacs) (wdired-mode . normal) ; (inferior-emacs-lisp-mode . emacs) ; (wdired-mode . normal) diff --git a/zsh/zshrc b/zsh/zshrc index 9301e4a..045e33c 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -1,4 +1,4 @@ - +#!/bin/zsh autoload colors colors @@ -138,9 +138,9 @@ GIT_PROMPT_SUFFIX="%{$fg[green]%}]%{$reset_color%}" GIT_PROMPT_AHEAD="%{$fg[red]%}ANUM%{$reset_color%}" GIT_PROMPT_BEHIND="%{$fg[cyan]%}BNUM%{$reset_color%}" GIT_PROMPT_MERGING="%{$fg_bold[magenta]%}⚡︎%{$reset_color%}" -GIT_PROMPT_UNTRACKED="%{$fg_bold[red]%}●%{$reset_color%}" -GIT_PROMPT_MODIFIED="%{$fg_bold[yellow]%}●%{$reset_color%}" -GIT_PROMPT_STAGED="%{$fg_bold[green]%}●%{$reset_color%}" +GIT_PROMPT_UNTRACKED="%{$fg_bold[red]%}•%{$reset_color%}" +GIT_PROMPT_MODIFIED="%{$fg_bold[yellow]%}•%{$reset_color%}" +GIT_PROMPT_STAGED="%{$fg_bold[green]%}•%{$reset_color%}" # Show Git branch/tag, or name-rev if on detached head parse_git_branch() { -- 2.11.0