From 83eda5263443329a9bf667c51e343cb2aae39b10 Mon Sep 17 00:00:00 2001
From: 10sr <8slashes+git@gmail.com>
Date: Fri, 2 Mar 2012 23:46:11 +0900
Subject: [PATCH] misc changes

---
 bashrc   | 2 +-
 emacs.el | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bashrc b/bashrc
index 2e65b14..8f02e1a 100755
--- a/bashrc
+++ b/bashrc
@@ -207,7 +207,7 @@ _mygitconfig(){
     git config --global alias.ci "commit --verbose"
     git config --global alias.co "checkout"
     git config --global alias.cim "commit --verbose -m"
-    git config --global alias.di "diff"
+    git config --global alias.di "diff --color"
     git config --global alias.me "merge --no-ff --stat -v"
     git config --global alias.ls "ls-files -v --full-name"
     git config --global alias.sl "!sl"
diff --git a/emacs.el b/emacs.el
index 711b1d2..3eaea86 100644
--- a/emacs.el
+++ b/emacs.el
@@ -1589,8 +1589,8 @@ when SEC is nil, stop auto save if enabled."
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; misc funcs
 
-(when (require 'ansi-color nil t)
-  (ansi-color-for-comint-mode-on))
+;; (when (require 'ansi-color nil t)
+;;   (ansi-color-for-comint-mode-on))
 (defvar git-command-history nil
   "History list for git command.")
 (defun my-git-shell-command (cmd)