diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-16 15:51:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-16 15:51:11 -0800 |
| commit | 6e13921b4f7adcc7316a76c0c4955b85b1589a65 (patch) | |
| tree | d741279335c8a6b9e1565d1a999bc0018545a754 /git-gui/lib/diff.tcl | |
| parent | bf31115312aefd36f1571379842eebebf34dcb55 (diff) | |
| parent | 941930732fc0bbffbd19e9fa09fe00bc1512a3a7 (diff) | |
| download | git-6e13921b4f7adcc7316a76c0c4955b85b1589a65.tar.gz | |
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui:
git-gui: Fix the search bar destruction handler.
Update the po template
git-gui: Implement automatic rescan after Tool execution.
git-gui: Allow Tools request arguments from the user.
git-gui: Add a Tools menu for arbitrary commands.
git-gui: Fix the after callback execution in rescan.
git-gui: Implement system-wide configuration handling.
git-gui: try to provide a window icon under X
Diffstat (limited to 'git-gui/lib/diff.tcl')
| -rw-r--r-- | git-gui/lib/diff.tcl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-gui/lib/diff.tcl b/git-gui/lib/diff.tcl index 94ee38cccc..bbbf15c875 100644 --- a/git-gui/lib/diff.tcl +++ b/git-gui/lib/diff.tcl @@ -16,7 +16,7 @@ proc clear_diff {} { $ui_workdir tag remove in_diff 0.0 end } -proc reshow_diff {} { +proc reshow_diff {{after {}}} { global file_states file_lists global current_diff_path current_diff_side global ui_diff @@ -30,13 +30,13 @@ proc reshow_diff {} { || [lsearch -sorted -exact $file_lists($current_diff_side) $p] == -1} { if {[find_next_diff $current_diff_side $p {} {[^O]}]} { - next_diff + next_diff $after } else { clear_diff } } else { set save_pos [lindex [$ui_diff yview] 0] - show_diff $p $current_diff_side {} $save_pos + show_diff $p $current_diff_side {} $save_pos $after } } |