gitk: Don't clobber "Remember this view" setting

jrn · paulusmack · commit 5d11f794de3c · 2010-03-20T20:53:21.000+11:00
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 &lt;steve0001@s.cotton.clara.co.uk&gt;
Signed-off-by: Jonathan Nieder &lt;jrnieder@gmail.com&gt;
Signed-off-by: Paul Mackerras &lt;paulus@samba.org&gt;
diff --git a/gitk b/gitk
@@ -3811,10 +3811,10 @@ proc newview {ishighlight} {
 	raise $top
 	return
     }
+    decode_view_opts $nextviewnum $revtreeargs
     set newviewname($nextviewnum) "[mc "View"] $nextviewnum"
     set newviewopts($nextviewnum,perm) 0
     set newviewopts($nextviewnum,cmd)  $viewargscmd($curview)
-    decode_view_opts $nextviewnum $revtreeargs
     vieweditor $top $nextviewnum [mc "Gitk view definition"]
 }
 
@@ -3968,10 +3968,10 @@ proc editview {} {
 	raise $top
 	return
     }
+    decode_view_opts $curview $viewargs($curview)
     set newviewname($curview)      $viewname($curview)
     set newviewopts($curview,perm) $viewperm($curview)
     set newviewopts($curview,cmd)  $viewargscmd($curview)
-    decode_view_opts $curview $viewargs($curview)
     vieweditor $top $curview "[mc "Gitk: edit view"] $viewname($curview)"
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3811,10 +3811,10 @@ proc newview {ishighlight} {`
`3811`	`3811`	`raise $top`
`3812`	`3812`	`return`
`3813`	`3813`	`}`
	`3814`	`+ decode_view_opts $nextviewnum $revtreeargs`
`3814`	`3815`	`set newviewname($nextviewnum) "[mc "View"] $nextviewnum"`
`3815`	`3816`	`set newviewopts($nextviewnum,perm) 0`
`3816`	`3817`	`set newviewopts($nextviewnum,cmd) $viewargscmd($curview)`
`3817`		`- decode_view_opts $nextviewnum $revtreeargs`
`3818`	`3818`	`vieweditor $top $nextviewnum [mc "Gitk view definition"]`
`3819`	`3819`	`}`
`3820`	`3820`
`@@ -3968,10 +3968,10 @@ proc editview {} {`
`3968`	`3968`	`raise $top`
`3969`	`3969`	`return`
`3970`	`3970`	`}`
	`3971`	`+ decode_view_opts $curview $viewargs($curview)`
`3971`	`3972`	`set newviewname($curview) $viewname($curview)`
`3972`	`3973`	`set newviewopts($curview,perm) $viewperm($curview)`
`3973`	`3974`	`set newviewopts($curview,cmd) $viewargscmd($curview)`
`3974`		`- decode_view_opts $curview $viewargs($curview)`
`3975`	`3975`	`vieweditor $top $curview "[mc "Gitk: edit view"] $viewname($curview)"`
`3976`	`3976`	`}`
`3977`	`3977`