From ffa4d489676f40582b63c1791d3bf5d3b75d8421 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 2 Apr 2019 08:45:32 +0000
Subject: Store and restore cursor across reflow by working out a position
 based on unwrapped lines, rather than a grid offset. Fixes problems reported
 by Thomas Sattler and Paul de Weerd.

---
 tmux.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index 91002ad0..0821d790 100644
--- a/tmux.h
+++ b/tmux.h
@@ -2101,8 +2101,8 @@ char	*grid_string_cells(struct grid *, u_int, u_int, u_int,
 void	 grid_duplicate_lines(struct grid *, u_int, struct grid *, u_int,
 	     u_int);
 void	 grid_reflow(struct grid *, u_int);
-u_int	 grid_to_offset(struct grid *, u_int, u_int);
-void	 grid_from_offset(struct grid *, u_int, u_int *, u_int *);
+void	 grid_wrap_position(struct grid *, u_int, u_int, u_int *, u_int *);
+void	 grid_unwrap_position(struct grid *, u_int *, u_int *, u_int, u_int);
 
 /* grid-view.c */
 void	 grid_view_get_cell(struct grid *, u_int, u_int, struct grid_cell *);
-- 
cgit 


From 7bcc0d16f24506bed6568ba36bcd278cfc06d069 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 2 Apr 2019 09:03:39 +0000
Subject: Add an argument to copy commands to set the prefix for the buffer
 name, allows buffers for different sessions to be named separately.

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

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index 0821d790..31fbae32 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1611,7 +1611,7 @@ struct paste_buffer *paste_walk(struct paste_buffer *);
 struct paste_buffer *paste_get_top(const char **);
 struct paste_buffer *paste_get_name(const char *);
 void		 paste_free(struct paste_buffer *);
-void		 paste_add(char *, size_t);
+void		 paste_add(const char *, char *, size_t);
 int		 paste_rename(const char *, const char *, char **);
 int		 paste_set(char *, size_t, const char *, char **);
 char		*paste_make_sample(struct paste_buffer *);
-- 
cgit