From c0fc4e6edd5883d480116ec70944ded1e7f4fd78 Mon Sep 17 00:00:00 2001
From: Cyryl Plotnicki-Chudyk <cyplo@cyplo.net>
Date: Wed, 27 Nov 2013 10:10:17 +0100
Subject: [PATCH] better font settings for cygwin, kdiff3 works with git
 difftool now

---
 .gitconfig_includes.cygwin |  2 +-
 .minttyrc                  |  7 ++++---
 cygwin/cygwinify.sh        | 19 +++++++++++++++++++
 cygwin/kdiff3.sh           |  3 +++
 4 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100755 cygwin/cygwinify.sh
 create mode 100755 cygwin/kdiff3.sh

diff --git a/.gitconfig_includes.cygwin b/.gitconfig_includes.cygwin
index 8a8cb695..34196e06 100644
--- a/.gitconfig_includes.cygwin
+++ b/.gitconfig_includes.cygwin
@@ -1,5 +1,5 @@
 [difftool "kdiff3"]
-    path = kdiff3
+    path = kdiff3.sh
     trustExitCode = false
 [difftool]
     prompt = false
diff --git a/.minttyrc b/.minttyrc
index 6c26b644..ab20e9d0 100644
--- a/.minttyrc
+++ b/.minttyrc
@@ -1,4 +1,4 @@
-BoldAsFont=no
+BoldAsFont=yes
 Term=xterm-256color
 Columns=225
 Rows=70
@@ -23,6 +23,7 @@ White=238,232,213
 BoldWhite=253,246,227
 Font=Inconsolata for Powerline
 FontHeight=12
-FontSmoothing=full
-Locale=C
+FontSmoothing=partial
+Locale=en_GB
 Charset=UTF-8
+FontIsBold=yes
diff --git a/cygwin/cygwinify.sh b/cygwin/cygwinify.sh
new file mode 100755
index 00000000..2f84a339
--- /dev/null
+++ b/cygwin/cygwinify.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/bash
+RESULT=""
+for arg
+do
+if [[ "" != "$arg" ]] && [[ -e $arg ]];
+then
+OUT=`cygpath -wa $arg`
+else
+if [[ $arg == -* ]];
+then
+OUT=$arg
+else
+OUT="'$arg'"
+fi
+fi
+RESULT=$RESULT$OUT" "
+done
+echo "$RESULT"
+
diff --git a/cygwin/kdiff3.sh b/cygwin/kdiff3.sh
new file mode 100755
index 00000000..2e9967b6
--- /dev/null
+++ b/cygwin/kdiff3.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/bash
+kdiff3 `~/tools/cygwinify.sh "$@"`
+