Merge branch 'master' into dev

diff --cc gitk
index 7b62e98ec12876fb8a4324721a6ea14e0830807c,769c79ab07520d5bcdad9493ab383553d2031988..c0cdd625f220f3b71d5ce4f3aba6871842ef2a3a
--- 1/gitk
--- 2/gitk
+++ b/gitk
@@@ -2931,21 -2957,36 +2955,19 @@@ proc layoutrows {row endrow last} 
        }
        lappend rowrangelist $ranges
        incr row
 -      set offs [ntimes [llength $idlist] 0]
 -      set l [llength $newolds]
 -      set idlist [eval lreplace \$idlist $col $col $newolds]
 -      set o 0
 -      if {$l != 1} {
 -          set offs [lrange $offs 0 [expr {$col - 1}]]
 -          foreach x $newolds {
 -              lappend offs {}
 -              incr o -1
 -          }
 -          incr o
 -          set tmp [expr {[llength $idlist] - [llength $offs]}]
 -          if {$tmp > 0} {
 -              set offs [concat $offs [ntimes $tmp $o]]
 -          }
 -      } else {
 -          lset offs $col {}
 -      }
 +      set idlist [lreplace $idlist $col $col]
 +      set x $col
        foreach i $newolds {
-           set idinlist($i) 1
 +          set x [idcol $idlist $i $x]
 +          set idlist [linsert $idlist $x $i]
            set idrowranges($i) $id
        }
 -      incr col $l
        foreach oid $oldolds {
-           set idinlist($oid) 1
 -          set idlist [linsert $idlist $col $oid]
 -          set offs [linsert $offs $col $o]
 -          makeuparrow $oid $col $row $o
 -          incr col
 +          set x [idcol $idlist $oid $x]
 +          set idlist [linsert $idlist $x $oid]
 +          makeuparrow $oid $row $x
        }
        lappend rowidlist $idlist
 -      lappend rowoffsets $offs
      }
      return $row
  }