Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2015-08-13 18:01:07 +01:00
commit 778612d152

View File

@ -101,10 +101,10 @@ const char *cmd_find_pane_table[][2] = {
{ "{top-right}", "top-right" }, { "{top-right}", "top-right" },
{ "{bottom-left}", "bottom-left" }, { "{bottom-left}", "bottom-left" },
{ "{bottom-right}", "bottom-right" }, { "{bottom-right}", "bottom-right" },
{ "{up-of}", "{up}" }, { "{up-of}", "{up-of}" },
{ "{down-of}", "{down}" }, { "{down-of}", "{down-of}" },
{ "{left-of}", "{left}" }, { "{left-of}", "{left-of}" },
{ "{right-up}", "{right}" }, { "{right-of}", "{right-of}" },
{ NULL, NULL } { NULL, NULL }
}; };
@ -698,22 +698,22 @@ cmd_find_get_pane_with_window(struct cmd_find_state *fs, const char *pane)
return (-1); return (-1);
fs->wp = fs->w->last; fs->wp = fs->w->last;
return (0); return (0);
} else if (strcmp(pane, "{up}") == 0) { } else if (strcmp(pane, "{up-of}") == 0) {
fs->wp = window_pane_find_up(fs->w->active); fs->wp = window_pane_find_up(fs->w->active);
if (fs->wp == NULL) if (fs->wp == NULL)
return (-1); return (-1);
return (0); return (0);
} else if (strcmp(pane, "{down}") == 0) { } else if (strcmp(pane, "{down-of}") == 0) {
fs->wp = window_pane_find_down(fs->w->active); fs->wp = window_pane_find_down(fs->w->active);
if (fs->wp == NULL) if (fs->wp == NULL)
return (-1); return (-1);
return (0); return (0);
} else if (strcmp(pane, "{left}") == 0) { } else if (strcmp(pane, "{left-of}") == 0) {
fs->wp = window_pane_find_left(fs->w->active); fs->wp = window_pane_find_left(fs->w->active);
if (fs->wp == NULL) if (fs->wp == NULL)
return (-1); return (-1);
return (0); return (0);
} else if (strcmp(pane, "{right}") == 0) { } else if (strcmp(pane, "{right-of}") == 0) {
fs->wp = window_pane_find_right(fs->w->active); fs->wp = window_pane_find_right(fs->w->active);
if (fs->wp == NULL) if (fs->wp == NULL)
return (-1); return (-1);