Merge branch 'master' of github.com:10sr/dotfiles

emacs.el

@@ -1593,8 +1593,7 @@ if arg given, use that eshell buffer, otherwise make new eshell buffer."
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; frame buffer
-;; todo:
-;;    work well when opening the file that was already opened on another window
+;; todo: work well when opening files already opened on another window
 
 (add-hook 'after-make-frame-functions
           (lambda (f)

setup.sh

@@ -65,6 +65,7 @@ git_config(){
     git config --global alias.cim "commit --verbose -m"
     git config --global alias.di "diff --color"
     git config --global alias.me "merge --no-ff --stat -v"
+    git config --global alias.gr "grep -n"
     # git config --global alias.ls "ls-files -v --full-name"
     git config --global alias.ls "status -u -s ."
     git config --global alias.sl "!sl"
@@ -72,7 +73,7 @@ git_config(){
     # git config --global alias.ll "!git ls-files | xargs ls -l -CFG --color=auto --time-style=long-iso"
     git config --global alias.addi "add -i"
     git config --global alias.clean-p "!test -z \"\$(git status -s -uno)\""
-    git config --global alias.wc "!git ls-files -z | xargs -0 wc"
+    #git config --global alias.wc "!git ls-files -z | xargs -0 wc"
     # git config --global push.default "simple"
     if _iswindows; then
         git config --global core.fileMode false

tmux.conf.pl

@@ -42,6 +42,7 @@ sub set_key {
 }
 
 sub set_prefs {
+    # this does not workd because `run' do script asyncly
     set("base-index", "1");
     set("pane-base-index", "1");
     setw("mode-keys", "vi");