gitk fix for set uicolor SystemButtonFace

["Matt Seitz (matseitz)" <matseitz@cisco.com>]

"Eric Blake (cygwin)" wrote:
>
> This release should cater to the fact that tcl is now X-based.  Before
> reporting any problems with gitk or git-gui, first check that you are
> running an X server.  Also, gitk will complain if your ~/.gitk has a
> line 'set uicolor SystemButtonFace'; there's nothing I can do about it
> at a packaging level, but you can remove the offending line to get
past it.

Below is a diff of how I fixed the problem in my existing .gitk file.

The source of the problem is that gitk creates a Win32 specific .gitk
file if tk reports that the windowing system is Win32:
https://github.com/gitster/git/commit/1924d1bc0dc99cd3460d3551671908cc76
c09d3b

Now that Cygwin has changed tk to use the X11 windowing system instead
of Win32, the Win32 .gitk file no longer works.

The fix is to change the .gitk file to use the default settings:

---
 .gitk |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitk b/.gitk
index 6f48d0c..fd50dc9 100755
--- a/.gitk
+++ b/.gitk
@@ -14,15 +14,15 @@ set hideremotes 0
 set showlocalchanges 1
 set datetimeformat {%Y-%m-%d %H:%M:%S}
 set limitdiffs 1
-set uicolor SystemButtonFace
+set uicolor grey85
 set want_ttk 1
-set bgcolor SystemWindow
-set fgcolor SystemButtonText
+set bgcolor white
+set fgcolor black
 set colors {green red blue magenta darkgrey brown orange}
 set diffcolors {red "#00a000" blue}
 set markbgcolor #e0e0ff
 set diffcontext 3
-set selectbgcolor SystemHighlight
+set selectbgcolor gray85
 set extdifftool meld
 set perfile_attrs 0
 set geometry(main) 1235x672+22+93



--
Problem reports:       http://cygwin.com/problems.html
FAQ:                   http://cygwin.com/faq/
Documentation:         http://cygwin.com/docs.html
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple