circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 05:21:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2017-04-21 22:01:14 +01:00
parent 1f209ed030 c68ceca8cd
commit fd13731049
9 changed files with 194 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
notify.c
View File

@ -43,9 +43,9 @@ notify_hook(struct cmdq_item *item, struct notify_entry *ne)
struct session *s = ne->session;
struct window *w = ne->window;
cmd_find_clear_state(&fs, NULL, 0);
cmd_find_clear_state(&fs, 0);
if (cmd_find_empty_state(&ne->fs) || !cmd_find_valid_state(&ne->fs))
cmd_find_current(&fs, item, CMD_FIND_QUIET);
cmd_find_from_nothing(&fs);
else
cmd_find_copy_state(&fs, &ne->fs);
@ -163,10 +163,7 @@ notify_client(const char *name, struct client *c)
{
struct cmd_find_state fs;
if (c->session != NULL)
cmd_find_from_session(&fs, c->session);
else
cmd_find_current(&fs, NULL, CMD_FIND_QUIET);
cmd_find_from_client(&fs, c);
notify_add(name, &fs, c, NULL, NULL, NULL);
}
@ -178,7 +175,7 @@ notify_session(const char *name, struct session *s)
if (session_alive(s))
cmd_find_from_session(&fs, s);
else
cmd_find_current(&fs, NULL, CMD_FIND_QUIET);
cmd_find_from_nothing(&fs);
notify_add(name, &fs, NULL, s, NULL, NULL);
}