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>
This commit is contained in:
Jonathan Nieder 2010-03-06 16:58:42 -06:00 коммит произвёл Paul Mackerras
Родитель e7feb695bf
Коммит 5d11f794de
1 изменённых файлов: 2 добавлений и 2 удалений

4
gitk
Просмотреть файл

@ -3811,10 +3811,10 @@ proc newview {ishighlight} {
raise $top raise $top
return return
} }
decode_view_opts $nextviewnum $revtreeargs
set newviewname($nextviewnum) "[mc "View"] $nextviewnum" set newviewname($nextviewnum) "[mc "View"] $nextviewnum"
set newviewopts($nextviewnum,perm) 0 set newviewopts($nextviewnum,perm) 0
set newviewopts($nextviewnum,cmd) $viewargscmd($curview) set newviewopts($nextviewnum,cmd) $viewargscmd($curview)
decode_view_opts $nextviewnum $revtreeargs
vieweditor $top $nextviewnum [mc "Gitk view definition"] vieweditor $top $nextviewnum [mc "Gitk view definition"]
} }
@ -3968,10 +3968,10 @@ proc editview {} {
raise $top raise $top
return return
} }
decode_view_opts $curview $viewargs($curview)
set newviewname($curview) $viewname($curview) set newviewname($curview) $viewname($curview)
set newviewopts($curview,perm) $viewperm($curview) set newviewopts($curview,perm) $viewperm($curview)
set newviewopts($curview,cmd) $viewargscmd($curview) set newviewopts($curview,cmd) $viewargscmd($curview)
decode_view_opts $curview $viewargs($curview)
vieweditor $top $curview "[mc "Gitk: edit view"] $viewname($curview)" vieweditor $top $curview "[mc "Gitk: edit view"] $viewname($curview)"
} }