projects
/
dotfiles.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
6dadf90
)
emacs - magit related change
author
Peng Li
<seudut@gmail.com>
Thu, 17 Sep 2015 11:59:20 +0000
(19:59 +0800)
committer
Peng Li
<seudut@gmail.com>
Thu, 17 Sep 2015 11:59:20 +0000
(19:59 +0800)
emacs.d/config/init-evil.el
patch
|
blob
|
history
zsh/zshrc
patch
|
blob
|
history
diff --git
a/emacs.d/config/init-evil.el
b/emacs.d/config/init-evil.el
index
5067725
..
b920d8f
100644
(file)
--- 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)
(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)
(wdired-mode . normal)
; (inferior-emacs-lisp-mode . emacs)
; (wdired-mode . normal)
diff --git
a/zsh/zshrc
b/zsh/zshrc
index
9301e4a
..
045e33c
100644
(file)
--- a/
zsh/zshrc
+++ b/
zsh/zshrc
@@
-1,4
+1,4
@@
-
+#!/bin/zsh
autoload colors
colors
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_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]%}â
\97
\8f
%{$reset_color%}"
-GIT_PROMPT_MODIFIED="%{$fg_bold[yellow]%}â
\97
\8f
%{$reset_color%}"
-GIT_PROMPT_STAGED="%{$fg_bold[green]%}â
\97
\8f
%{$reset_color%}"
+GIT_PROMPT_UNTRACKED="%{$fg_bold[red]%}â
\80
¢
%{$reset_color%}"
+GIT_PROMPT_MODIFIED="%{$fg_bold[yellow]%}â
\80
¢
%{$reset_color%}"
+GIT_PROMPT_STAGED="%{$fg_bold[green]%}â
\80
¢
%{$reset_color%}"
# Show Git branch/tag, or name-rev if on detached head
parse_git_branch() {
# Show Git branch/tag, or name-rev if on detached head
parse_git_branch() {