Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2020-04-13 10:30:00 +01:00
74 changed files with 538 additions and 326 deletions

View File

@ -75,6 +75,14 @@ notify_insert_hook(struct cmdq_item *item, struct notify_entry *ne)
else
oo = fs.s->options;
o = options_get(oo, ne->name);
if (o == NULL && fs.wp != NULL) {
oo = fs.wp->options;
o = options_get(oo, ne->name);
}
if (o == NULL && fs.wl != NULL) {
oo = fs.wl->window->options;
o = options_get(oo, ne->name);
}
if (o == NULL)
return;