From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 28 Jun 2007 03:48:17 +0000 (-0700)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk
X-Git-Tag: v1.5.3-rc0~49
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fe5e7f332c8a95680a869eaca8033213676cbc7b?hp=9cc0589ae85b782534b893faedc6a482fd9905ea

Merge branch 'master' of git://git./gitk/gitk

* 'master' of git://git.kernel.org/pub/scm/gitk/gitk:
gitk: Update selection background colorbar in prefs dialog
gitk: Use a spinbox for setting tabstop settings
---

diff --git a/gitk b/gitk
index 269f9b08a0..2d6a6ef9ce 100755
--- a/gitk
+++ b/gitk
@@ -6972,7 +6972,7 @@ proc doprefs {} {
     pack $top.ntag.b $top.ntag.l -side left
     grid x $top.ntag -sticky w
     label $top.tabstopl -text "tabstop" -font optionfont
-    entry $top.tabstop -width 10 -textvariable tabstop
+    spinbox $top.tabstop -from 1 -to 20 -width 4 -textvariable tabstop
     grid x $top.tabstopl $top.tabstop -sticky w
 
     label $top.cdisp -text "Colors: press to choose"
@@ -7004,7 +7004,7 @@ proc doprefs {} {
     grid x $top.hunksepbut $top.hunksep -sticky w
     label $top.selbgsep -padx 40 -relief sunk -background $selectbgcolor
     button $top.selbgbut -text "Select bg" -font optionfont \
-	-command [list choosecolor selectbgcolor 0 $top.bg background setselbg]
+	-command [list choosecolor selectbgcolor 0 $top.selbgsep background setselbg]
     grid x $top.selbgbut $top.selbgsep -sticky w
 
     frame $top.buts