Browse Source

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

pull/1/head
10sr 11 years ago
parent
commit
96377e8690
2 changed files with 5 additions and 3 deletions
  1. +4
    -2
      bashrc
  2. +1
    -1
      emacs.el

+ 4
- 2
bashrc View File

@@ -238,11 +238,12 @@ null type pacmatic && {

_pacman_update_mirrorlist_with_reflector(){
ml=/etc/pacman.d/mirrorlist
cmd="$(expr "$(grep reflector $ml)" : '# With: *\(.*\)')"
cmd="$(expr "$(grep -m 1 reflector $ml)" : '# With: *\(.*\)')"
if test -z "$cmd"
then
cmd="reflector --verbose -l 5 --sort rate --save /etc/pacman.d/mirrorlist"
cmd="reflector --verbose -l 5 --sort rate --save $ml"
fi
echo "Running $cmd ..." 1>&2
sudo $cmd
}
null type reflector && test -f /etc/pacman.d/mirrorlist && \
@@ -284,6 +285,7 @@ then
complete -o bashdefault -o default -o nospace -F _git g 2>/dev/null \
|| complete -o default -o nospace -F _git g
fi
git svn --help >/dev/null 2>&1 && alias gsvn="git svn"
null type gitmemo && alias m=gitmemo

null type gitmemo && alias m=gitmemo


+ 1
- 1
emacs.el View File

@@ -1829,7 +1829,7 @@ if arg given, use that eshell buffer, otherwise make new eshell buffer."
(require 'grep)
(compilation-start (if (eq 0
(shell-command "git rev-parse --git-dir"))
(format "git --no-pager grep -nH -e '%s'"
(format "git --no-pager -c color.grep=false grep -nH -e '%s'"
word)
(if (executable-find "ag")
(format "ag --nocolor --nogroup --nopager '%s'"


Loading…
Cancel
Save