diff --git a/bashrc b/bashrc index 79dfca4..b9e1284 100755 --- a/bashrc +++ b/bashrc @@ -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 && \ @@ -283,6 +284,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 diff --git a/emacs.el b/emacs.el index 869e491..38cefed 100644 --- a/emacs.el +++ b/emacs.el @@ -715,6 +715,7 @@ found, otherwise returns nil." "https://raw.github.com/10sr/emacs-lisp/master/git-command.el" t) (lazy-load-eval 'git-command) + (setq git-command-default-options "-c color.ui=always") (define-key ctl-x-map "g" 'git-command)) (and (fetch-library @@ -1828,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'"