The branch, master has been updated
via da72a0b7a8b1f893fd25cfdacef9be7dffa61989 (commit)
via aae2b7aa89b80ec6b07a8036f923dc6c8882cfae (commit)
via fee096a40680dff40557f016b5904b3dfbf9072c (commit)
via be0ad01b7c4d9d7948d9c9595ff2a4af3af68793 (commit)
from daea0e4fff77e63ea05392b67d96606c5e7b3ecc (commit)
- Log -----------------------------------------------------------------
commit da72a0b7a8b1f893fd25cfdacef9be7dffa61989
Merge: daea0e4 aae2b7a
Author: Thomas Adam <[email protected]>
Commit: Thomas Adam <[email protected]>
Merge branch 'obsd-master'
grid-view.c | 9 ++-------
server-fn.c | 1 +
tmux.1 | 12 ++++++++++--
3 files changed, 13 insertions(+), 9 deletions(-)
commit aae2b7aa89b80ec6b07a8036f923dc6c8882cfae
Author: nicm <nicm>
Commit: nicm <nicm>
Revert to r1.16 since this is still clearly broken and I can't see how
right now.
---
grid-view.c | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/grid-view.c b/grid-view.c
index 078a0da..badabd5 100644
--- a/grid-view.c
+++ b/grid-view.c
@@ -184,10 +184,7 @@ grid_view_insert_cells(struct grid *gd, u_int px, u_int
py, u_int nx)
px = grid_view_x(gd, px);
py = grid_view_y(gd, py);
- if (gd->linedata[py].cellsize + nx < gd->sx)
- sx = grid_view_x(gd, gd->linedata[py].cellsize + nx);
- else
- sx = grid_view_x(gd, gd->sx);
+ sx = grid_view_x(gd, gd->sx);
if (px == sx - 1)
grid_clear(gd, px, py, 1, 1);
@@ -204,9 +201,7 @@ grid_view_delete_cells(struct grid *gd, u_int px, u_int py,
u_int nx)
px = grid_view_x(gd, px);
py = grid_view_y(gd, py);
- sx = grid_view_x(gd, gd->linedata[py].cellsize);
- if (sx < px + nx)
- sx = px + nx;
+ sx = grid_view_x(gd, gd->sx);
grid_move_cells(gd, px, px + nx, py, sx - px - nx);
grid_clear(gd, sx - nx, py, px + nx - (sx - nx), 1);
commit fee096a40680dff40557f016b5904b3dfbf9072c
Author: nicm <nicm>
Commit: nicm <nicm>
Unzoom before kill, from Thomas Adam.
---
server-fn.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/server-fn.c b/server-fn.c
index 310f16e..b8cdb31 100644
--- a/server-fn.c
+++ b/server-fn.c
@@ -270,6 +270,7 @@ server_kill_window(struct window *w)
if (session_has(s, w) == NULL)
continue;
+ server_unzoom_window(w);
while ((wl = winlink_find_by_window(&s->windows, w)) != NULL) {
if (session_detach(s, wl)) {
server_destroy_session_group(s);
commit be0ad01b7c4d9d7948d9c9595ff2a4af3af68793
Author: nicm <nicm>
Commit: nicm <nicm>
Add missing default bindings, from Theo Buehler.
---
tmux.1 | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/tmux.1 b/tmux.1
index 5154adb..1d4f292 100644
--- a/tmux.1
+++ b/tmux.1
@@ -247,6 +247,10 @@ Split the current pane into two, left and right.
Kill the current window.
.It '
Prompt for a window index to select.
+.It \&(
+Switch the attached client to the previous session.
+.It \&)
+Switch the attached client to the next session.
.It ,
Rename the current window.
.It -
@@ -267,6 +271,8 @@ Choose which buffer to paste interactively from a list.
List all key bindings.
.It D
Choose a client to detach.
+.It L
+Switch the attached client back to the last session.
.It \&[
Enter copy mode to copy text or view the history.
.It \&]
@@ -293,14 +299,14 @@ Briefly display pane indexes.
Force redraw of the attached client.
.It s
Select a new session for the attached client interactively.
-.It L
-Switch the attached client back to the last session.
.It t
Show the time.
.It w
Choose the current window interactively.
.It x
Kill the current pane.
+.It z
+Toggle zoom state of the current pane.
.It {
Swap the current pane with the previous pane.
.It }
@@ -318,6 +324,8 @@ pane.
.It M-1 to M-5
Arrange panes in one of the five preset layouts: even-horizontal,
even-vertical, main-horizontal, main-vertical, or tiled.
+.It Space
+Arrange the current window in the next preset layout.
.It M-n
Move to the next window with a bell or activity marker.
.It M-o
-----------------------------------------------------------------------
Summary of changes:
grid-view.c | 9 ++-------
server-fn.c | 1 +
tmux.1 | 12 ++++++++++--
3 files changed, 13 insertions(+), 9 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
Dive into the World of Parallel Programming! The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
