Save the maxwidth setting in the ~/.gitk file.

[git.git] / gitk

diff --git a/gitk b/gitk
index 33abcc4..1c6b382 100755 (executable)
--- a/gitk
+++ b/gitk
@@ -528,6 +528,7 @@ proc click {w} {
 proc savestuff {w} {
     global canv canv2 canv3 ctext cflist mainfont textfont
     global stuffsaved findmergefiles gaudydiff maxgraphpct
+    global maxwidth
 
     if {$stuffsaved} return
     if {![winfo viewable .]} return
@@ -538,6 +539,7 @@ proc savestuff {w} {
        puts $f [list set findmergefiles $findmergefiles]
        puts $f [list set gaudydiff $gaudydiff]
        puts $f [list set maxgraphpct $maxgraphpct]
+       puts $f [list set maxwidth $maxwidth]
        puts $f "set geometry(width) [winfo width .ctop]"
        puts $f "set geometry(height) [winfo height .ctop]"
        puts $f "set geometry(canv1) [expr [winfo width $canv]-2]"
@@ -1019,6 +1021,7 @@ proc drawslants {id needonscreen nohs} {
     }
     if {$onscreen($id) == 0} {
        lappend displist $id
+       set onscreen($id) 1
     }
 
     # remove the null entry if present
@@ -1186,15 +1189,10 @@ proc drawslants {id needonscreen nohs} {
                set j [lsearch -exact $displist $id]
            }
            if {$j != $i || $xspc1($lineno) != $xspc1($lj)
-               || ($olddlevel <= $i && $i <= $dlevel)
-               || ($dlevel <= $i && $i <= $olddlevel)} {
+               || ($olddlevel < $i && $i < $dlevel)
+               || ($dlevel < $i && $i < $olddlevel)} {
                set xj [xcoord $j $dlevel $lj]
-               set dx [expr {abs($xi - $xj)}]
-               set yb $y2
-               if {0 && $dx < $linespc} {
-                   set yb [expr {$y1 + $dx}]
-               }
-               lappend mainline($id) $xi $y1 $xj $yb
+               lappend mainline($id) $xi $y1 $xj $y2
            }
        }
     }