summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-03-06 22:58:42 (GMT)
committerPaul Mackerras <paulus@samba.org>2010-03-20 09:53:21 (GMT)
commit5d11f794de3c1a5cd592af008a369a90fa30d2e9 (patch)
treee0c0e8dd52219622602bb64534ce5d9efc4a4f96
parente7feb695bf93d57c1c5fdf9f2acc2039e3fdf850 (diff)
downloadgit-5d11f794de3c1a5cd592af008a369a90fa30d2e9.zip
git-5d11f794de3c1a5cd592af008a369a90fa30d2e9.tar.gz
git-5d11f794de3c1a5cd592af008a369a90fa30d2e9.tar.bz2
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>
-rwxr-xr-xgitk4
1 files changed, 2 insertions, 2 deletions
diff --git a/gitk b/gitk
index 140fe1f..8a4f727 100755
--- 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)"
}