From: Michael Haggerty Date: Mon, 19 Dec 2016 16:45:00 GMT Subject: [PATCH 01/13] gitk: when processing tag labels, don't use `marks` as scratch space Message-ID: <3f3d03e45f75acfdbbe8b51040b7e0932c926acb.1482164633.git.mhagger@alum.mit.edu> In-Reply-To: Instead, just append to it as necessary. Signed-off-by: Michael Haggerty --- gitk | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gitk b/gitk index a14d7a1..296efb3 100755 --- a/gitk +++ b/gitk @@ -6570,18 +6570,20 @@ proc drawtags {id x xt y1} { set extra [expr {$delta + $lthickness + $linespc}] if {[info exists idtags($id)]} { - set marks $idtags($id) - set ntags [llength $marks] + set tags $idtags($id) + set ntags [llength $tags] if {$ntags > $maxtags || - [totalwidth $marks mainfont $extra] > $maxwidth} { + [totalwidth $tags mainfont $extra] > $maxwidth} { # show just a single "n tags..." tag set singletag 1 if {$ntags == 1} { - set marks [list "tag..."] + lappend marks "tag..." } else { - set marks [list [format "%d tags..." $ntags]] + lappend marks [format "%d tags..." $ntags] + set ntags 1 } - set ntags 1 + } else { + set marks [concat $marks $tags] } } if {[info exists idheads($id)]} { -- 2.9.3