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

bashrc

@@ -218,7 +218,14 @@ if iscygwin; then
     alias ls="ls -CFG $(iswindows || test "$TERM" = dumb || echo --color=auto)"
 fi
 
-alias g=git
+g(){
+    if test $# -eq 0 && null type git-info
+    then
+        git info
+    else
+        git "$@"
+    fi
+}
 if null type _git
 then
     # enable programmable completion for g
@@ -679,7 +686,8 @@ __my_ps1_bttry(){
     if test -z "$DISPLAY" && ! iswindows
     then
         test -f $bst && local bstr="$(cat $bst)"
-        test -n "$bstr" && echo "[Battery:$bstr]"
+        test -n "$bstr" && ! echo $bstr | grep 100 >/dev/null 2>&1 && \
+            echo "[Battery:$bstr]"
         __my_battery_status %s >$bst &
     fi
     return $last

emacs.el

@@ -368,7 +368,7 @@ found, otherwise returns nil."
      (:background "color-234"))
     (((min-colors 256)
       (background light))
-     (:background "gainsboro"))
+     (:background "color-234"))
     (t
      (:underline "black")))
   "*Face used by hl-line.")