From a0a0c6838744ce51bcbb634f459e173e8be59c22 Mon Sep 17 00:00:00 2001 From: Alex Riesen Date: Tue, 28 Jun 2016 10:59:25 +0200 Subject: [PATCH] git-gui: ensure the file in the diff pane is in the list of selected files It is very confusing that the file which diff is displayed is marked as selected, but it is not in fact selected (that means the array of selected files does not include the file in question). Fixing this also improves the use of $FILENAMES in custom defined tools: one does not have to click the file in the list to make it selected. Signed-off-by: Alex Riesen Signed-off-by: Pat Thoyts --- lib/diff.tcl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/diff.tcl b/lib/diff.tcl index 0d56986215..30bdd691ee 100644 --- a/lib/diff.tcl +++ b/lib/diff.tcl @@ -127,6 +127,9 @@ proc show_diff {path w {lno {}} {scroll_pos {}} {callback {}}} { } else { start_show_diff $cont_info } + + global current_diff_path selected_paths + set selected_paths($current_diff_path) 1 } proc show_unmerged_diff {cont_info} { -- 2.40.0