From 987cbac71908149b54b53503fce4d497c964e57b Mon Sep 17 00:00:00 2001 From: 10sr <8slashes+git@gmail.com> Date: Wed, 19 Dec 2012 21:09:33 +0900 Subject: [PATCH 1/3] fix emacs color name --- emacs.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emacs.el b/emacs.el index e3214d9..9a69905 100644 --- a/emacs.el +++ b/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.") From 9a86fb2c4e3b298dc0eeeb2dec77fc7b70e80248 Mon Sep 17 00:00:00 2001 From: 10sr <8slashes+git@gmail.com> Date: Thu, 20 Dec 2012 13:32:48 +0900 Subject: [PATCH 2/3] do not show battery status when 100% --- bashrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bashrc b/bashrc index 041743d..be7059e 100755 --- a/bashrc +++ b/bashrc @@ -678,7 +678,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 From 6c98c6efb747e0de804c837e319888d377e28758 Mon Sep 17 00:00:00 2001 From: 10sr <8slashes+git@gmail.com> Date: Thu, 20 Dec 2012 14:53:10 +0900 Subject: [PATCH 3/3] update g command --- bashrc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/bashrc b/bashrc index be7059e..7043005 100755 --- a/bashrc +++ b/bashrc @@ -217,7 +217,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