Merge branch 'dev'

diff --cc gitk
index ff5eb5e8c48392a408b854c3da337749cd91bdce,5230e3bb9df53c6b7244ccd5c573021275d3c93c..4efcbb79574d91fdc8f03b1bf38db937fd2ec0c4
--- 1/gitk
--- 2/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 {$maxwidth != $oldprefs(maxwidth)
 +    if {$limitdiffs != $oldprefs(limitdiffs)} {
 +      # treediffs elements are limited by path
 +      catch {unset treediffs}
 +    }
+     if {$fontchanged || $maxwidth != $oldprefs(maxwidth)
        || $maxgraphpct != $oldprefs(maxgraphpct)} {
        redisplay
      } elseif {$showneartags != $oldprefs(showneartags) ||