gitk: Don't clobber "Remember this view" setting
In the View → Edit View... dialog, the "Remember this view" option always starts out unset. Using the dialog to change an existing view and ignoring the parts of the dialog that aren’t relevant results in both the old and new versions of the view being lost. The cause: right after newviewopts($curview,perm) is set to an appropriate value, decode_view_opts is clobbering it with the default value. If that call is moved a little earlier, the "Remember this view" option gets properly set to its previous value, fixing the problem. Reported-by: Steve Cotton <steve0001@s.cotton.clara.co.uk> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
Jonathan Nieder committed
Mar 6, 2010 at 16:58 UTC
5d11f794de3c1a5cd592af008a369a90fa30d2e9
1 file changed
+2
-2
gitk
+2
-2
@@ -3811,10 +3811,10 @@ proc newview {ishighlight} {
3811
raise $top
3812
return
3813
}
3814
+ decode_view_opts $nextviewnum $revtreeargs
3815
set newviewname($nextviewnum) "[mc "View"] $nextviewnum"
3816
set newviewopts($nextviewnum,perm) 0
3817
set newviewopts($nextviewnum,cmd) $viewargscmd($curview)
3817
- decode_view_opts $nextviewnum $revtreeargs
3818
vieweditor $top $nextviewnum [mc "Gitk view definition"]
3819
}
3820
@@ -3968,10 +3968,10 @@ proc editview {} {
3968
raise $top
3969
return
3970
}
3971
+ decode_view_opts $curview $viewargs($curview)
3972
set newviewname($curview) $viewname($curview)
3973
set newviewopts($curview,perm) $viewperm($curview)
3974
set newviewopts($curview,cmd) $viewargscmd($curview)
3974
- decode_view_opts $curview $viewargs($curview)
3975
vieweditor $top $curview "[mc "Gitk: edit view"] $viewname($curview)"
3976
}
3977