diff options
| author | Johannes Sixt <j6t@kdbg.org> | 2025-07-22 17:34:08 +0200 |
|---|---|---|
| committer | Johannes Sixt <j6t@kdbg.org> | 2025-07-22 17:34:31 +0200 |
| commit | 594810d2a9ac754260d47c192164e8ab77695a91 (patch) | |
| tree | d078d53007808700f68d951e2a17b1df1b3f733d /lib/diff.tcl | |
| parent | dab92fe42fad87a2f7067589a32ee08e70d5354b (diff) | |
| parent | 9b1c537fdbdf5bcad2f73bbad8eb06983889ff78 (diff) | |
| download | git-594810d2a9ac754260d47c192164e8ab77695a91.tar.xz | |
Merge branch 'ml/tcl86'
* ml/tcl86:
git-gui: remove non-ttk code
git-gui: remove ${NS} indirection for ttk
git-gui: always use themed widgets from ttk
git-gui: remove redundant check for Tk >= 8.5
git-gui: remove unreachable Tk 8.4 code
git-gui: Make TclTk 8.6 the minimum, allow 8.7
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Diffstat (limited to 'lib/diff.tcl')
| -rw-r--r-- | lib/diff.tcl | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/diff.tcl b/lib/diff.tcl index 84f0468c7c..9df555c505 100644 --- a/lib/diff.tcl +++ b/lib/diff.tcl @@ -2,15 +2,13 @@ # Copyright (C) 2006, 2007 Shawn Pearce proc apply_tab_size {{firsttab {}}} { - global have_tk85 repo_config ui_diff + global repo_config ui_diff set w [font measure font_diff "0"] - if {$have_tk85 && $firsttab != 0} { + if {$firsttab != 0} { $ui_diff configure -tabs [list [expr {$firsttab * $w}] [expr {($firsttab + $repo_config(gui.tabsize)) * $w}]] - } elseif {$have_tk85 || $repo_config(gui.tabsize) != 8} { - $ui_diff configure -tabs [expr {$repo_config(gui.tabsize) * $w}] } else { - $ui_diff configure -tabs {} + $ui_diff configure -tabs [expr {$repo_config(gui.tabsize) * $w}] } } |