The branch, master has been updated
via 31f93d84458dca70b94f1b20fa67f64e08e05305 (commit)
via 2a609b332f6cdc2ef6f3ffb525a3c74ada738ec4 (commit)
via 18236c1c1bd9afc994971fe2806dac905242be98 (commit)
via 596e9d80681cf77459dd31f084daa468a766a9d8 (commit)
via 589b4b8c6a54541441d10e2578bca05d4b0153a0 (commit)
from d4dc52ec8451c51b8566ebbcfdb2210a556facdc (commit)
- Log -----------------------------------------------------------------
commit 31f93d84458dca70b94f1b20fa67f64e08e05305
Merge: d4dc52e 2a609b3
Author: Thomas Adam <tho...@xteddy.org>
Commit: Thomas Adam <tho...@xteddy.org>
Merge branch 'obsd-master'
Sync from OpenBSD.
cmd-find-window.c | 1 +
cmd-list-windows.c | 1 +
server-window.c | 4 +++-
tmux.1 | 2 +-
window.c | 2 +-
5 files changed, 7 insertions(+), 3 deletions(-)
commit 2a609b332f6cdc2ef6f3ffb525a3c74ada738ec4
Author: Nicholas Marriott <n...@openbsd.org>
Commit: Nicholas Marriott <n...@openbsd.org>
Add ability to active pane in list-windows and find-window formats, from
Carl Henrik Lunde.
---
cmd-find-window.c | 1 +
cmd-list-windows.c | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/cmd-find-window.c b/cmd-find-window.c
index 340f6e1..f2b20ae 100644
--- a/cmd-find-window.c
+++ b/cmd-find-window.c
@@ -193,6 +193,7 @@ cmd_find_window_exec(struct cmd *self, struct cmd_ctx *ctx)
ARRAY_ITEM(&find_list, i).list_ctx);
format_session(cdata->ft, s);
format_winlink(cdata->ft, s, wm);
+ format_window_pane(cdata->ft, wm->window->active);
window_choose_add(wl->window->active, cdata);
}
diff --git a/cmd-list-windows.c b/cmd-list-windows.c
index 146d29a..0485e4a 100644
--- a/cmd-list-windows.c
+++ b/cmd-list-windows.c
@@ -99,6 +99,7 @@ cmd_list_windows_session(
format_add(ft, "line", "%u", n);
format_session(ft, s);
format_winlink(ft, s, wl);
+ format_window_pane(ft, wl->window->active);
line = format_expand(ft, template);
ctx->print(ctx, "%s", line);
commit 18236c1c1bd9afc994971fe2806dac905242be98
Author: Nicholas Marriott <n...@openbsd.org>
Commit: Nicholas Marriott <n...@openbsd.org>
Fix BELL_NONE which had been broken in some code reorganisation or other
also don't redraw unnecessarily. From Seiji Ohashi.
---
server-window.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/server-window.c b/server-window.c
index 8f3e2b6..8b34fc6 100644
--- a/server-window.c
+++ b/server-window.c
@@ -75,12 +75,14 @@ server_window_check_bell(struct session *s, struct winlink
*wl)
if (s->curw != wl || s->flags & SESSION_UNATTACHED)
wl->flags |= WINLINK_BELL;
if (s->flags & SESSION_UNATTACHED)
- return (1);
+ return (0);
if (s->curw->window == wl->window)
w->flags &= ~WINDOW_BELL;
visual = options_get_number(&s->options, "visual-bell");
action = options_get_number(&s->options, "bell-action");
+ if (action == BELL_NONE)
+ return (0);
for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
c = ARRAY_ITEM(&clients, i);
if (c == NULL || c->session != s)
commit 596e9d80681cf77459dd31f084daa468a766a9d8
Author: Nicholas Marriott <n...@openbsd.org>
Commit: Nicholas Marriott <n...@openbsd.org>
Fix bad size in memcpy from Romain Francoise.
---
window.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/window.c b/window.c
index 71225a9..07e6ae1 100644
--- a/window.c
+++ b/window.c
@@ -1193,7 +1193,7 @@ winlink_clear_flags(struct winlink *wl)
void
window_mode_attrs(struct grid_cell *gc, struct options *oo)
{
- memcpy(gc, &grid_default_cell, sizeof gc);
+ memcpy(gc, &grid_default_cell, sizeof *gc);
colour_set_fg(gc, options_get_number(oo, "mode-fg"));
colour_set_bg(gc, options_get_number(oo, "mode-bg"));
gc->attr |= options_get_number(oo, "mode-attr");
commit 589b4b8c6a54541441d10e2578bca05d4b0153a0
Author: Nicholas Marriott <n...@openbsd.org>
Commit: Nicholas Marriott <n...@openbsd.org>
Fix typo bell->bells from Thomas Adam.
---
tmux.1 | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tmux.1 b/tmux.1
index db60f8e..c5c45b7 100644
--- a/tmux.1
+++ b/tmux.1
@@ -2039,7 +2039,7 @@ window of that session,
.Ic none
means all bells are ignored and
.Ic current
-means only bell in windows other than the current window are ignored.
+means only bells in windows other than the current window are ignored.
.It Xo Ic bell-on-alert
.Op Ic on | off
.Xc
-----------------------------------------------------------------------
Summary of changes:
cmd-find-window.c | 1 +
cmd-list-windows.c | 1 +
server-window.c | 4 +++-
tmux.1 | 2 +-
window.c | 2 +-
5 files changed, 7 insertions(+), 3 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_sfd2d_oct
_______________________________________________
tmux-cvs mailing list
tmux-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
