Merge branch 'master' of git://git.ozlabs.org/~paulus/gitk

* 'master' of git://git.ozlabs.org/~paulus/gitk:
  gitk: include y coord in recorded sash position
  gitk: trivial indentation fix

diff --combined gitk-git/gitk
index 23d9dd1fe0d024c4af344c35faf01365ec8a6c58,0ae7d685904b85f97a69b243e30f010671d050e3..0ae7d685904b85f97a69b243e30f010671d050e3
--- 1/gitk-git/gitk
--- 2/gitk
+++ b/gitk-git/gitk
@@@ -2955,9 -2955,9 +2955,9 @@@ proc savestuff {w} 
  proc resizeclistpanes {win w} {
      global oldwidth oldsash use_ttk
      if {[info exists oldwidth($win)]} {
-       if {[info exists oldsash($win)]} {
-           set s0 [lindex $oldsash($win) 0]
-           set s1 [lindex $oldsash($win) 1]
+         if {[info exists oldsash($win)]} {
+             set s0 [lindex $oldsash($win) 0]
+             set s1 [lindex $oldsash($win) 1]
          } elseif {$use_ttk} {
              set s0 [$win sashpos 0]
              set s1 [$win sashpos 1]
@@@ -2991,8 -2991,10 +2991,10 @@@
          } else {
              $win sash place 0 $sash0 [lindex $s0 1]
              $win sash place 1 $sash1 [lindex $s1 1]
+             set sash0 [list $sash0 [lindex $s0 1]]
+             set sash1 [list $sash1 [lindex $s1 1]]
          }
-       set oldsash($win) [list $sash0 $sash1]
+         set oldsash($win) [list $sash0 $sash1]
      }
      set oldwidth($win) $w
  }
@@@ -3000,8 -3002,8 +3002,8 @@@
  proc resizecdetpanes {win w} {
      global oldwidth oldsash use_ttk
      if {[info exists oldwidth($win)]} {
-       if {[info exists oldsash($win)]} {
-           set s0 $oldsash($win)
+         if {[info exists oldsash($win)]} {
+             set s0 $oldsash($win)
          } elseif {$use_ttk} {
              set s0 [$win sashpos 0]
          } else {
@@@ -3023,8 -3025,9 +3025,9 @@@
              $win sashpos 0 $sash0
          } else {
              $win sash place 0 $sash0 [lindex $s0 1]
+             set sash0 [list $sash0 [lindex $s0 1]]
          }
-       set oldsash($win) $sash0
+         set oldsash($win) $sash0
      }
      set oldwidth($win) $w
  }