From: Mark Levedahl <mlevedahl@gmail.com>
Date: Sun, 18 Feb 2024 18:06:05 +0000 (-0500)
Subject: git-gui: remove redundant check for Tk >= 8.5
X-Git-Tag: v2.51.0-rc0~46^2~1^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=13df401e3ecd0673eee70bd4d5e0247edf29db0f;p=thirdparty%2Fgit.git

git-gui: remove redundant check for Tk >= 8.5

Since commit c80d7be5e1e0d, git-gui checks for the availability of ttk
before enabling its use, but this check is redundant as Tk >= 8.6 is
required.  Remove the redundant check.

Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
---

diff --git a/git-gui.sh b/git-gui.sh
index 2b5d84a56e..d395634caf 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -916,13 +916,11 @@ proc apply_config {} {
 	set use_ttk 0
 	set NS {}
 	if {$repo_config(gui.usettk)} {
-		set use_ttk [package vsatisfies [package provide Tk] 8.5]
-		if {$use_ttk} {
-			set NS ttk
-			bind [winfo class .] <<ThemeChanged>> [list InitTheme]
-			pave_toplevel .
-			color::sync_with_theme
-		}
+		set use_ttk 1
+		set NS ttk
+		bind [winfo class .] <<ThemeChanged>> [list InitTheme]
+		pave_toplevel .
+		color::sync_with_theme
 	}
 
 	global comment_string