From cfdc5b62ad64a4a41a604cd3b8ae00d9bb928bdf Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 15 Aug 2022 08:37:03 +0000
Subject: Don't stop at first match when updating environment.

---
 environ.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/environ.c b/environ.c
index 74d672e0..5abf383c 100644
--- a/environ.c
+++ b/environ.c
@@ -182,9 +182,11 @@ void
 environ_update(struct options *oo, struct environ *src, struct environ *dst)
 {
 	struct environ_entry		*envent;
+	struct environ_entry		*envent1;
 	struct options_entry		*o;
 	struct options_array_item	*a;
 	union options_value		*ov;
+	int				 found;
 
 	o = options_get(oo, "update-environment");
 	if (o == NULL)
@@ -192,14 +194,15 @@ environ_update(struct options *oo, struct environ *src, struct environ *dst)
 	a = options_array_first(o);
 	while (a != NULL) {
 		ov = options_array_item_value(a);
-		RB_FOREACH(envent, environ, src) {
-			if (fnmatch(ov->string, envent->name, 0) == 0)
-				break;
+		found = 0;
+		RB_FOREACH_SAFE(envent, environ, src, envent1) {
+			if (fnmatch(ov->string, envent->name, 0) == 0) {
+				environ_set(dst, envent->name, 0, "%s", envent->value);
+				found = 1;
+			}
 		}
-		if (envent == NULL)
+		if (!found)
 			environ_clear(dst, ov->string);
-		else
-			environ_set(dst, envent->name, 0, "%s", envent->value);
 		a = options_array_next(a);
 	}
 }
-- 
cgit 


From 497021d0db40790cc9a98bb1d70ae091d170831e Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 15 Aug 2022 08:41:13 +0000
Subject: Add some const, from Markus F X J Oberhumer.

---
 key-bindings.c |  2 +-
 tty-features.c | 54 +++++++++++++++++++++++++++---------------------------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/key-bindings.c b/key-bindings.c
index 6ce9c14c..4b790dfc 100644
--- a/key-bindings.c
+++ b/key-bindings.c
@@ -344,7 +344,7 @@ key_bindings_init_done(__unused struct cmdq_item *item, __unused void *data)
 void
 key_bindings_init(void)
 {
-	static const char *defaults[] = {
+	static const char *const defaults[] = {
 		/* Prefix keys. */
 		"bind -N 'Send the prefix key' C-b { send-prefix }",
 		"bind -N 'Rotate through the panes' C-o { rotate-window }",
diff --git a/tty-features.c b/tty-features.c
index 396a351e..261cb2b8 100644
--- a/tty-features.c
+++ b/tty-features.c
@@ -36,13 +36,13 @@
 
 /* A named terminal feature. */
 struct tty_feature {
-	const char	 *name;
-	const char	**capabilities;
-	int		  flags;
+	const char		*name;
+	const char *const	*capabilities;
+	int			 flags;
 };
 
 /* Terminal has xterm(1) title setting. */
-static const char *tty_feature_title_capabilities[] = {
+static const char *const tty_feature_title_capabilities[] = {
 	"tsl=\\E]0;", /* should be using TS really */
 	"fsl=\\a",
 	NULL
@@ -54,7 +54,7 @@ static const struct tty_feature tty_feature_title = {
 };
 
 /* Terminal has OSC 7 working directory. */
-static const char *tty_feature_osc7_capabilities[] = {
+static const char *const tty_feature_osc7_capabilities[] = {
 	"Swd=\\E]7;",
 	"fsl=\\a",
 	NULL
@@ -66,7 +66,7 @@ static const struct tty_feature tty_feature_osc7 = {
 };
 
 /* Terminal has mouse support. */
-static const char *tty_feature_mouse_capabilities[] = {
+static const char *const tty_feature_mouse_capabilities[] = {
 	"kmous=\\E[M",
 	NULL
 };
@@ -77,7 +77,7 @@ static const struct tty_feature tty_feature_mouse = {
 };
 
 /* Terminal can set the clipboard with OSC 52. */
-static const char *tty_feature_clipboard_capabilities[] = {
+static const char *const tty_feature_clipboard_capabilities[] = {
 	"Ms=\\E]52;%p1%s;%p2%s\\a",
 	NULL
 };
@@ -88,7 +88,7 @@ static const struct tty_feature tty_feature_clipboard = {
 };
 
 /* Terminal supports OSC 8 hyperlinks. */
-static const char *tty_feature_hyperlinks_capabilities[] = {
+static const char *const tty_feature_hyperlinks_capabilities[] = {
 	"*:Hls=\\E]8;%?%p1%l%tid=%p1%s%;;%p2%s\\E\\\\",
 	NULL
 };
@@ -103,7 +103,7 @@ static const struct tty_feature tty_feature_hyperlinks = {
  * terminals with RGB have versions that do not allow setting colours from the
  * 256 palette.
  */
-static const char *tty_feature_rgb_capabilities[] = {
+static const char *const tty_feature_rgb_capabilities[] = {
 	"AX",
 	"setrgbf=\\E[38;2;%p1%d;%p2%d;%p3%dm",
 	"setrgbb=\\E[48;2;%p1%d;%p2%d;%p3%dm",
@@ -118,7 +118,7 @@ static const struct tty_feature tty_feature_rgb = {
 };
 
 /* Terminal supports 256 colours. */
-static const char *tty_feature_256_capabilities[] = {
+static const char *const tty_feature_256_capabilities[] = {
 	"AX",
 	"setab=\\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m",
 	"setaf=\\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m",
@@ -131,7 +131,7 @@ static const struct tty_feature tty_feature_256 = {
 };
 
 /* Terminal supports overline. */
-static const char *tty_feature_overline_capabilities[] = {
+static const char *const tty_feature_overline_capabilities[] = {
 	"Smol=\\E[53m",
 	NULL
 };
@@ -142,7 +142,7 @@ static const struct tty_feature tty_feature_overline = {
 };
 
 /* Terminal supports underscore styles. */
-static const char *tty_feature_usstyle_capabilities[] = {
+static const char *const tty_feature_usstyle_capabilities[] = {
 	"Smulx=\\E[4::%p1%dm",
 	"Setulc=\\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m",
 	"ol=\\E[59m",
@@ -155,7 +155,7 @@ static const struct tty_feature tty_feature_usstyle = {
 };
 
 /* Terminal supports bracketed paste. */
-static const char *tty_feature_bpaste_capabilities[] = {
+static const char *const tty_feature_bpaste_capabilities[] = {
 	"Enbp=\\E[?2004h",
 	"Dsbp=\\E[?2004l",
 	NULL
@@ -167,7 +167,7 @@ static const struct tty_feature tty_feature_bpaste = {
 };
 
 /* Terminal supports focus reporting. */
-static const char *tty_feature_focus_capabilities[] = {
+static const char *const tty_feature_focus_capabilities[] = {
 	"Enfcs=\\E[?1004h",
 	"Dsfcs=\\E[?1004l",
 	NULL
@@ -179,7 +179,7 @@ static const struct tty_feature tty_feature_focus = {
 };
 
 /* Terminal supports cursor styles. */
-static const char *tty_feature_cstyle_capabilities[] = {
+static const char *const tty_feature_cstyle_capabilities[] = {
 	"Ss=\\E[%p1%d q",
 	"Se=\\E[2 q",
 	NULL
@@ -191,7 +191,7 @@ static const struct tty_feature tty_feature_cstyle = {
 };
 
 /* Terminal supports cursor colours. */
-static const char *tty_feature_ccolour_capabilities[] = {
+static const char *const tty_feature_ccolour_capabilities[] = {
 	"Cs=\\E]12;%p1%s\\a",
 	"Cr=\\E]112\\a",
 	NULL
@@ -203,7 +203,7 @@ static const struct tty_feature tty_feature_ccolour = {
 };
 
 /* Terminal supports strikethrough. */
-static const char *tty_feature_strikethrough_capabilities[] = {
+static const char *const tty_feature_strikethrough_capabilities[] = {
 	"smxx=\\E[9m",
 	NULL
 };
@@ -214,7 +214,7 @@ static const struct tty_feature tty_feature_strikethrough = {
 };
 
 /* Terminal supports synchronized updates. */
-static const char *tty_feature_sync_capabilities[] = {
+static const char *const tty_feature_sync_capabilities[] = {
 	"Sync=\\EP=%p1%ds\\E\\\\",
 	NULL
 };
@@ -225,7 +225,7 @@ static const struct tty_feature tty_feature_sync = {
 };
 
 /* Terminal supports extended keys. */
-static const char *tty_feature_extkeys_capabilities[] = {
+static const char *const tty_feature_extkeys_capabilities[] = {
 	"Eneks=\\E[>4;1m",
 	"Dseks=\\E[>4m",
 	NULL
@@ -237,7 +237,7 @@ static const struct tty_feature tty_feature_extkeys = {
 };
 
 /* Terminal supports DECSLRM margins. */
-static const char *tty_feature_margins_capabilities[] = {
+static const char *const tty_feature_margins_capabilities[] = {
 	"Enmg=\\E[?69h",
 	"Dsmg=\\E[?69l",
 	"Clmg=\\E[s",
@@ -251,7 +251,7 @@ static const struct tty_feature tty_feature_margins = {
 };
 
 /* Terminal supports DECFRA rectangle fill. */
-static const char *tty_feature_rectfill_capabilities[] = {
+static const char *const tty_feature_rectfill_capabilities[] = {
 	"Rect",
 	NULL
 };
@@ -262,7 +262,7 @@ static const struct tty_feature tty_feature_rectfill = {
 };
 
 /* Use builtin function keys only. */
-static const char *tty_feature_ignorefkeys_capabilities[] = {
+static const char *const tty_feature_ignorefkeys_capabilities[] = {
 	"kf0@",
 	"kf1@",
 	"kf2@",
@@ -336,7 +336,7 @@ static const struct tty_feature tty_feature_ignorefkeys = {
 };
 
 /* Available terminal features. */
-static const struct tty_feature *tty_features[] = {
+static const struct tty_feature *const tty_features[] = {
 	&tty_feature_256,
 	&tty_feature_bpaste,
 	&tty_feature_ccolour,
@@ -410,9 +410,9 @@ tty_get_features(int feat)
 int
 tty_apply_features(struct tty_term *term, int feat)
 {
-	const struct tty_feature	 *tf;
-	const char			**capability;
-	u_int				  i;
+	const struct tty_feature	*tf;
+	const char *const		*capability;
+	u_int				 i;
 
 	if (feat == 0)
 		return (0);
@@ -443,7 +443,7 @@ tty_apply_features(struct tty_term *term, int feat)
 void
 tty_default_features(int *feat, const char *name, u_int version)
 {
-	static struct {
+	static const struct {
 		const char	*name;
 		u_int		 version;
 		const char	*features;
-- 
cgit 


From 03149bf7f62e2c92d0e60087c52604d2dd51794f Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 15 Aug 2022 08:54:03 +0000
Subject: Add a Nobr terminfo capability to tell tmux the terminal does not use
 bright colours for bold (makes a difference to how tmux applies palette
 differences). From Damien Tardy-Panis in GitHub issue 3301.

---
 tmux.1     | 4 ++++
 tmux.h     | 1 +
 tty-term.c | 1 +
 tty.c      | 8 +++++---
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/tmux.1 b/tmux.1
index fa7fcbfb..b6283373 100644
--- a/tmux.1
+++ b/tmux.1
@@ -6430,6 +6430,10 @@ These are set automatically if the
 capability is present.
 .It Em \&Hls
 Set or clear a hyperlink annotation.
+.It Em \&Nobr
+Tell
+.Nm
+that the terminal does not use bright colors for bold display.
 .It Em \&Rect
 Tell
 .Nm
diff --git a/tmux.h b/tmux.h
index 4196a31c..413d8c38 100644
--- a/tmux.h
+++ b/tmux.h
@@ -514,6 +514,7 @@ enum tty_code_code {
 	TTYC_KUP6,
 	TTYC_KUP7,
 	TTYC_MS,
+	TTYC_NOBR,
 	TTYC_OL,
 	TTYC_OP,
 	TTYC_RECT,
diff --git a/tty-term.c b/tty-term.c
index a877ef6b..e3167f19 100644
--- a/tty-term.c
+++ b/tty-term.c
@@ -247,6 +247,7 @@ static const struct tty_term_code_entry tty_term_codes[] = {
 	[TTYC_KUP6] = { TTYCODE_STRING, "kUP6" },
 	[TTYC_KUP7] = { TTYCODE_STRING, "kUP7" },
 	[TTYC_MS] = { TTYCODE_STRING, "Ms" },
+	[TTYC_NOBR] = { TTYCODE_STRING, "Nobr" },
 	[TTYC_OL] = { TTYCODE_STRING, "ol" },
 	[TTYC_OP] = { TTYCODE_STRING, "op" },
 	[TTYC_RECT] = { TTYCODE_STRING, "Rect" },
diff --git a/tty.c b/tty.c
index a7ad536f..1394075d 100644
--- a/tty.c
+++ b/tty.c
@@ -2690,12 +2690,14 @@ tty_check_fg(struct tty *tty, struct colour_palette *palette,
 
 	/*
 	 * Perform substitution if this pane has a palette. If the bright
-	 * attribute is set, use the bright entry in the palette by changing to
-	 * the aixterm colour.
+	 * attribute is set and Nobr is not present, use the bright entry in
+	 * the palette by changing to the aixterm colour
 	 */
 	if (~gc->flags & GRID_FLAG_NOPALETTE) {
 		c = gc->fg;
-		if (c < 8 && gc->attr & GRID_ATTR_BRIGHT)
+		if (c < 8 &&
+		    gc->attr & GRID_ATTR_BRIGHT &&
+		    !tty_term_has(tty->term, TTYC_NOBR))
 			c += 90;
 		if ((c = colour_palette_get(palette, c)) != -1)
 			gc->fg = c;
-- 
cgit 


From 7c2dcd72380dc2d9e119e99cb423a67ae17b6bd2 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 15 Aug 2022 09:10:34 +0000
Subject: Notify when a paste buffer is deleted, GitHub issue 3302 from George
 Nachman.

---
 control-notify.c | 13 +++++++++++++
 notify.c         | 29 ++++++++++++++++++++++-------
 paste.c          | 11 +++++++++++
 tmux.1           |  4 ++++
 tmux.h           |  2 ++
 5 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/control-notify.c b/control-notify.c
index 6ff0e436..a252dd05 100644
--- a/control-notify.c
+++ b/control-notify.c
@@ -234,3 +234,16 @@ control_notify_session_window_changed(struct session *s)
 		    s->curw->window->id);
 	}
 }
+
+void
+control_notify_paste_buffer_changed(const char *name)
+{
+	struct client	*c;
+
+	TAILQ_FOREACH(c, &clients, entry) {
+		if (!CONTROL_SHOULD_NOTIFY_CLIENT(c))
+			continue;
+
+		control_write(c, "%%paste-changed %s", name);
+	}
+}
diff --git a/notify.c b/notify.c
index 619bd933..03730b98 100644
--- a/notify.c
+++ b/notify.c
@@ -33,6 +33,7 @@ struct notify_entry {
 	struct session		*session;
 	struct window		*window;
 	int			 pane;
+	const char		*pbname;
 };
 
 static struct cmdq_item *
@@ -150,6 +151,8 @@ notify_callback(struct cmdq_item *item, void *data)
 		control_notify_session_closed(ne->session);
 	if (strcmp(ne->name, "session-window-changed") == 0)
 		control_notify_session_window_changed(ne->session);
+	if (strcmp(ne->name, "paste-buffer-changed") == 0)
+		control_notify_paste_buffer_changed(ne->pbname);
 
 	notify_insert_hook(item, ne);
 
@@ -165,6 +168,7 @@ notify_callback(struct cmdq_item *item, void *data)
 
 	format_free(ne->formats);
 	free((void *)ne->name);
+	free((void *)ne->pbname);
 	free(ne);
 
 	return (CMD_RETURN_NORMAL);
@@ -172,7 +176,8 @@ notify_callback(struct cmdq_item *item, void *data)
 
 static void
 notify_add(const char *name, struct cmd_find_state *fs, struct client *c,
-    struct session *s, struct window *w, struct window_pane *wp)
+    struct session *s, struct window *w, struct window_pane *wp,
+    const char *pbname)
 {
 	struct notify_entry	*ne;
 	struct cmdq_item	*item;
@@ -188,6 +193,7 @@ notify_add(const char *name, struct cmd_find_state *fs, struct client *c,
 	ne->session = s;
 	ne->window = w;
 	ne->pane = (wp != NULL ? wp->id : -1);
+	ne->pbname = (pbname != NULL ? xstrdup(pbname) : NULL);
 
 	ne->formats = format_create(NULL, NULL, 0, FORMAT_NOJOBS);
 	format_add(ne->formats, "hook", "%s", name);
@@ -249,7 +255,7 @@ notify_client(const char *name, struct client *c)
 	struct cmd_find_state	fs;
 
 	cmd_find_from_client(&fs, c, 0);
-	notify_add(name, &fs, c, NULL, NULL, NULL);
+	notify_add(name, &fs, c, NULL, NULL, NULL, NULL);
 }
 
 void
@@ -261,7 +267,7 @@ notify_session(const char *name, struct session *s)
 		cmd_find_from_session(&fs, s, 0);
 	else
 		cmd_find_from_nothing(&fs, 0);
-	notify_add(name, &fs, NULL, s, NULL, NULL);
+	notify_add(name, &fs, NULL, s, NULL, NULL, NULL);
 }
 
 void
@@ -270,7 +276,7 @@ notify_winlink(const char *name, struct winlink *wl)
 	struct cmd_find_state	fs;
 
 	cmd_find_from_winlink(&fs, wl, 0);
-	notify_add(name, &fs, NULL, wl->session, wl->window, NULL);
+	notify_add(name, &fs, NULL, wl->session, wl->window, NULL, NULL);
 }
 
 void
@@ -279,7 +285,7 @@ notify_session_window(const char *name, struct session *s, struct window *w)
 	struct cmd_find_state	fs;
 
 	cmd_find_from_session_window(&fs, s, w, 0);
-	notify_add(name, &fs, NULL, s, w, NULL);
+	notify_add(name, &fs, NULL, s, w, NULL, NULL);
 }
 
 void
@@ -288,7 +294,7 @@ notify_window(const char *name, struct window *w)
 	struct cmd_find_state	fs;
 
 	cmd_find_from_window(&fs, w, 0);
-	notify_add(name, &fs, NULL, NULL, w, NULL);
+	notify_add(name, &fs, NULL, NULL, w, NULL, NULL);
 }
 
 void
@@ -297,5 +303,14 @@ notify_pane(const char *name, struct window_pane *wp)
 	struct cmd_find_state	fs;
 
 	cmd_find_from_pane(&fs, wp, 0);
-	notify_add(name, &fs, NULL, NULL, NULL, wp);
+	notify_add(name, &fs, NULL, NULL, NULL, wp, NULL);
+}
+
+void
+notify_paste_buffer(const char *pbname)
+{
+  	struct cmd_find_state	fs;
+
+	cmd_find_clear_state(&fs, 0);
+	notify_add("paste-buffer-changed", &fs, NULL, NULL, NULL, NULL, pbname);
 }
diff --git a/paste.c b/paste.c
index 5ff36854..53477387 100644
--- a/paste.c
+++ b/paste.c
@@ -151,6 +151,8 @@ paste_get_name(const char *name)
 void
 paste_free(struct paste_buffer *pb)
 {
+	notify_paste_buffer(pb->name);
+
 	RB_REMOVE(paste_name_tree, &paste_by_name, pb);
 	RB_REMOVE(paste_time_tree, &paste_by_time, pb);
 	if (pb->automatic)
@@ -207,6 +209,8 @@ paste_add(const char *prefix, char *data, size_t size)
 	pb->order = paste_next_order++;
 	RB_INSERT(paste_name_tree, &paste_by_name, pb);
 	RB_INSERT(paste_time_tree, &paste_by_time, pb);
+
+	notify_paste_buffer(pb->name);
 }
 
 /* Rename a paste buffer. */
@@ -254,6 +258,9 @@ paste_rename(const char *oldname, const char *newname, char **cause)
 
 	RB_INSERT(paste_name_tree, &paste_by_name, pb);
 
+	notify_paste_buffer(oldname);
+	notify_paste_buffer(newname);
+
 	return (0);
 }
 
@@ -302,6 +309,8 @@ paste_set(char *data, size_t size, const char *name, char **cause)
 	RB_INSERT(paste_name_tree, &paste_by_name, pb);
 	RB_INSERT(paste_time_tree, &paste_by_time, pb);
 
+	notify_paste_buffer(name);
+
 	return (0);
 }
 
@@ -312,6 +321,8 @@ paste_replace(struct paste_buffer *pb, char *data, size_t size)
 	free(pb->data);
 	pb->data = data;
 	pb->size = size;
+
+	notify_paste_buffer(pb->name);
 }
 
 /* Convert start of buffer into a nice string. */
diff --git a/tmux.1 b/tmux.1
index b6283373..3a378c49 100644
--- a/tmux.1
+++ b/tmux.1
@@ -6596,6 +6596,10 @@ escapes non-printable characters and backslash as octal \\xxx.
 The pane with ID
 .Ar pane-id
 has changed mode.
+.It Ic %paste-buffer-changed Ar name
+Paste buffer
+.Ar name
+has been changed.
 .It Ic %pause Ar pane-id
 The pane has been paused (if the
 .Ar pause-after
diff --git a/tmux.h b/tmux.h
index 413d8c38..9b43e0fd 100644
--- a/tmux.h
+++ b/tmux.h
@@ -2154,6 +2154,7 @@ void	notify_winlink(const char *, struct winlink *);
 void	notify_session_window(const char *, struct session *, struct window *);
 void	notify_window(const char *, struct window *);
 void	notify_pane(const char *, struct window_pane *);
+void	notify_paste_buffer(const char *);
 
 /* options.c */
 struct options	*options_create(struct options *);
@@ -3174,6 +3175,7 @@ void	control_notify_session_renamed(struct session *);
 void	control_notify_session_created(struct session *);
 void	control_notify_session_closed(struct session *);
 void	control_notify_session_window_changed(struct session *);
+void	control_notify_paste_buffer_changed(const char *);
 
 /* session.c */
 extern struct sessions sessions;
-- 
cgit