From: Paul Mackerras <paulus@samba.org>
Date: Sat, 27 Oct 2007 11:23:20 +0000 (+1000)
Subject: Merge branch 'dev'
X-Git-Tag: v1.5.4-rc0~318^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7b3b1515288352149f3ed3b975b650a7f81046ed;p=git.git

Merge branch 'dev'
---

7b3b1515288352149f3ed3b975b650a7f81046ed
diff --cc gitk
index ff5eb5e8c,5230e3bb9..4efcbb795
--- a/gitk
+++ b/gitk
@@@ -7572,7 -8090,8 +8097,8 @@@ proc prefscan {} 
  proc prefsok {} {
      global maxwidth maxgraphpct
      global oldprefs prefstop showneartags showlocalchanges
-     global charspc ctext tabstop limitdiffs treediffs
+     global fontpref mainfont textfont uifont
 -    global limitdiffs
++    global limitdiffs treediffs
  
      catch {destroy $prefstop}
      unset prefstop
@@@ -7584,11 -8124,7 +8131,11 @@@
  	    dohidelocalchanges
  	}
      }
 +    if {$limitdiffs != $oldprefs(limitdiffs)} {
 +	# treediffs elements are limited by path
 +	catch {unset treediffs}
 +    }
-     if {$maxwidth != $oldprefs(maxwidth)
+     if {$fontchanged || $maxwidth != $oldprefs(maxwidth)
  	|| $maxgraphpct != $oldprefs(maxgraphpct)} {
  	redisplay
      } elseif {$showneartags != $oldprefs(showneartags) ||