# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1707731684 -7200
# Node ID 97df3a9b3d45f593be8e765bd3b9c9c478dfb551
# Parent  a17c3bdff36e91d30a09d4ceceb9c5f079968feb
Integrate the TF5 module into main and remove the module.

diff -r a17c3bdff36e -r 97df3a9b3d45 ggrtf.tf
--- a/ggrtf.tf	Mon Feb 12 11:53:34 2024 +0200
+++ b/ggrtf.tf	Mon Feb 12 11:54:44 2024 +0200
@@ -1179,11 +1179,7 @@
 	/else \
 		/set status_cast=%;\
 	/endif%;\
-	/if (gtf_version < 50008)\
-		/eval /prompt $[strip_attr(set_gprompt)]%;\
-	/else \
-		/eval /prompt -p %{set_gprompt}%;\
-	/endif%;\
+	/eval /prompt $[strip_attr(set_gprompt)]%;\
 	/gstatus_update
 
 
@@ -2800,6 +2796,23 @@
 /prdefgbind -s"balance" -c"/balance"
 /prdefgbind -s"cbalance" -c"/chkbalance"
 
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; TF5 extended statusline handling
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+/def -i gstatus_init =\
+	/prdefvar -n"status_height" -v"2" -c"The number of rows in the status area in TF visual mode (GgrTF::TF5 uses 2)"%;\
+	/prdefvar -n"status_start" -v"0" -c"Start row used by GgrTF in TF visual mode (GgrTF::TF5 uses 0 by default)"%;\
+	/if (status_height < 2) /set status_height=2%;/endif%;\
+	/status_add -s0 -r$[status_start+1] -c "["%;\
+	/status_add -s0 -r$[status_start+1] status_protstr2::Cgreen%;\
+	/status_add -s0 -r$[status_start+1] "]"
+
+/def -i gstatus_update =\
+	/gstatus_update_do%;\
+	/eval /status_add -c -s0 -r%{status_start} %{status_pstr}
+
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Global script initialization
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -2807,4 +2820,6 @@
 	/greset%;\
 	/ginitialize%;\
 	/set set_wasinit=1%;\
+	/gstatus_init%;\
+	/gstatus_update%;\
 /endif
diff -r a17c3bdff36e -r 97df3a9b3d45 gm-tf5.tf
--- a/gm-tf5.tf	Mon Feb 12 11:53:34 2024 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-;;
-;; GgrTF::TF5 - TinyFugue 5.x compatibility and extras
-;; (C) Copyright 2006-2015 Matti Hamalainen (Ggr)
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; This program is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License
-;; version 2 as published by the Free Software Foundation.
-;;
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; file "COPYING.txt" for more details.
-;;
-;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, write to the Free Software
-;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-;; MA 02110-1301 USA.
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; NOTICE! This file requires GgrTF (version 0.6.15 or later) to be loaded.
-;;
-/loaded GgrTF:TF5
-/test prdefmodule("TF5")
-
-/if (gtf_version < 50007)\
-	/gerror This module is designed for TinyFugue v5.0 beta 7 or later, it does not work in older versions of TF%;\
-	/exit%;\
-/endif
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; TF5 extended statusline handling
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-/def -i gstatus_init =\
-	/prdefvar -n"status_height" -v"2" -c"The number of rows in the status area in TF visual mode (GgrTF::TF5 uses 2)"%;\
-	/prdefvar -n"status_start" -v"0" -c"Start row used by GgrTF in TF visual mode (GgrTF::TF5 uses 0 by default)"%;\
-	/if (status_height < 2) /set status_height=2%;/endif%;\
-	/status_add -s0 -r$[status_start+1] -c "["%;\
-	/status_add -s0 -r$[status_start+1] status_protstr2::Cgreen%;\
-	/status_add -s0 -r$[status_start+1] "]"
-
-/def -i gstatus_update =\
-	/gstatus_update_do%;\
-	/eval /status_add -c -s0 -r%{status_start} %{status_pstr}
-
-/gstatus_init
-/gstatus_update