From: Peng Li <seudut@gmail.com>
Date: Mon, 14 Sep 2015 10:13:35 +0000 (+0800)
Subject: merge origine/master
X-Git-Url: http://47.100.26.94:8080/?a=commitdiff_plain;h=b4063eb834867f9f34d6a75e81baab7a503742de;p=dotfiles.git

merge origine/master
---

b4063eb834867f9f34d6a75e81baab7a503742de
diff --cc zsh/zshrc
index 0ade8e7,9b3fd68..9301e4a
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@@ -213,19 -213,5 +213,21 @@@ export ZSHHOME="$HOME/.zsh
  alias emacs='TERM=xterm-256color emacs -nw'
  
  alias tw='open -a /Applications/TextWrangler.app/'
 +
 +#
 +#function exists { which $1 &> /dev/null }
 +#
 +#if exists percol; then
 +#    function percol_select_history() {
 +#        local tac
 +#        exists gtac && tac="gtac" || { exists tac && tac="tac" || { tac="tail -r" } }
 +#        BUFFER=$(fc -l -n 1 | eval $tac | percol --query "$LBUFFER")
 +#        CURSOR=$#BUFFER         # move cursor
 +#        zle -R -c               # refresh
 +#    }
 +#
 +#    zle -N percol_select_history
 +#    bindkey '^R' percol_select_history
 +#fi
+ export LANG='en_US.UTF-8'
+ export LC_ALL="en_US.UTF-8"