From 3dbacbb62b033c04185fb87da5b0622f0aafee86 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 13 May 2014 07:34:35 +0000
Subject: Add support for named buffers. If you don't name a buffer, things
 work much as before - buffers are automatically named "buffer0000",
 "buffer0001" and so on and ordered as a stack. Buffers can be named
 explicitly when creating ("loadb -b foo" etc) or renamed ("setb -b buffer0000
 -n foo"). If buffers are named explicitly, they are not deleted when
 buffer-limit is reached. Diff from J Raynor.

---
 format.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'format.c')

diff --git a/format.c b/format.c
index 7c8ce779..028031a0 100644
--- a/format.c
+++ b/format.c
@@ -608,6 +608,7 @@ format_paste_buffer(struct format_tree *ft, struct paste_buffer *pb,
 	char	*s;
 
 	format_add(ft, "buffer_size", "%zu", pb->size);
+	format_add(ft, "buffer_name", "%s", pb->name);
 
 	s = paste_make_sample(pb, utf8flag);
 	format_add(ft, "buffer_sample", "%s", s);
-- 
cgit 


From b3e8d440ed0477e88232c3ba1779c67eafce3a48 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 13 May 2014 08:08:32 +0000
Subject: If multiple arguments are given to new-session, new-window,
 split-window, respawn-window or respawn-pane, pass them directly to execvp()
 to help avoid quoting problems. One argument still goes to "sh -c" like
 before. Requested by many over the years. Patch from J Raynor.

---
 format.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'format.c')

diff --git a/format.c b/format.c
index 028031a0..10e5e0a8 100644
--- a/format.c
+++ b/format.c
@@ -368,7 +368,7 @@ format_get_command(struct window_pane *wp)
 	cmd = get_proc_name(wp->fd, wp->tty);
 	if (cmd == NULL || *cmd == '\0') {
 		free(cmd);
-		cmd = xstrdup(wp->cmd);
+		cmd = cmd_stringify_argv(wp->argc, wp->argv);
 		if (cmd == NULL || *cmd == '\0') {
 			free(cmd);
 			cmd = xstrdup(wp->shell);
@@ -559,8 +559,10 @@ format_window_pane(struct format_tree *ft, struct window_pane *wp)
 	if (wp->tty != NULL)
 		format_add(ft, "pane_tty", "%s", wp->tty);
 	format_add(ft, "pane_pid", "%ld", (long) wp->pid);
-	if (wp->cmd != NULL)
-		format_add(ft, "pane_start_command", "%s", wp->cmd);
+	if ((cmd = cmd_stringify_argv(wp->argc, wp->argv)) != NULL) {
+		format_add(ft, "pane_start_command", "%s", cmd);
+		free(cmd);
+	}
 	if ((cmd = format_get_command(wp)) != NULL) {
 		format_add(ft, "pane_current_command", "%s", cmd);
 		free(cmd);
-- 
cgit