circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-03 06:17:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	Makefile
	client.c
	server-client.c
	server.c
	tmux.c
	tmux.h
This commit is contained in:
Thomas Adam
2015-10-27 23:27:26 +00:00
parent 147b5ae514 44657bf932
commit da1f6fc2c8
43 changed files with 872 additions and 824 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
format.c
View File

@ -598,15 +598,15 @@ format_find(struct format_tree *ft, const char *key, int modifiers)
found = NULL;
if (~modifiers & FORMAT_TIMESTRING) {
o = options_find(&global_options, key);
o = options_find(global_options, key);
if (o == NULL && ft->w != NULL)
o = options_find(&ft->w->options, key);
o = options_find(ft->w->options, key);
if (o == NULL)
o = options_find(&global_w_options, key);
o = options_find(global_w_options, key);
if (o == NULL && ft->s != NULL)
o = options_find(&ft->s->options, key);
o = options_find(ft->s->options, key);
if (o == NULL)
o = options_find(&global_s_options, key);
o = options_find(global_s_options, key);
if (o != NULL) {
switch (o->type) {
case OPTIONS_STRING:
@ -1118,7 +1118,7 @@ format_defaults_pane(struct format_tree *ft, struct window_pane *wp)
format_add(ft, "pane_in_mode", "%d", wp->screen != &wp->base);
format_add(ft, "pane_synchronized", "%d",
!!options_get_number(&wp->window->options, "synchronize-panes"));
!!options_get_number(wp->window->options, "synchronize-panes"));
format_add(ft, "pane_tty", "%s", wp->tty);
format_add(ft, "pane_pid", "%ld", (long) wp->pid);