From 2083a6ea2050fb211eab3da0df0ff5a40b4973b4 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 20 Apr 2020 14:59:31 +0000
Subject: Change how sync works to always send the end sequence after all
 output is done when we are returning to the event loop (since we always move
 the cursor at that point). Also a man fix from jmc.

---
 tmux.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index 3853b09f..5d7dbba7 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1992,7 +1992,6 @@ void	tty_cmd_reverseindex(struct tty *, const struct tty_ctx *);
 void	tty_cmd_setselection(struct tty *, const struct tty_ctx *);
 void	tty_cmd_rawstring(struct tty *, const struct tty_ctx *);
 void	tty_cmd_syncstart(struct tty *, const struct tty_ctx *);
-void	tty_cmd_syncend(struct tty *, const struct tty_ctx *);
 
 /* tty-term.c */
 extern struct tty_terms tty_terms;
-- 
cgit 


From 117ec1b2e603c2692ab564947b099ec79a20150f Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 20 Apr 2020 15:37:32 +0000
Subject: Apply terminal-overrides after terminal detection, it always takes
 precedence.

---
 tmux.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index 5d7dbba7..3fe32b50 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1997,6 +1997,7 @@ void	tty_cmd_syncstart(struct tty *, const struct tty_ctx *);
 extern struct tty_terms tty_terms;
 u_int		 tty_term_ncodes(void);
 void		 tty_term_apply(struct tty_term *, const char *, int);
+void		 tty_term_apply_overrides(struct tty_term *);
 struct tty_term *tty_term_create(struct tty *, char *, int *, int, char **);
 void		 tty_term_free(struct tty_term *);
 int		 tty_term_has(struct tty_term *, enum tty_code_code);
@@ -2017,7 +2018,7 @@ const char	*tty_term_describe(struct tty_term *, enum tty_code_code);
 /* tty-features.c */
 void		 tty_add_features(int *, const char *, const char *);
 const char	*tty_get_features(int);
-void		 tty_apply_features(struct tty_term *, int);
+int		 tty_apply_features(struct tty_term *, int);
 
 /* tty-acs.c */
 int		 tty_acs_needed(struct tty *);
-- 
cgit