circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-01-12 19:39:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2015-10-27 10:01:13 +00:00
commit 147b5ae514
3 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
format.c
View File

@ -660,6 +660,8 @@ format_find(struct format_tree *ft, const char *key, int modifiers)
return (NULL); return (NULL);
found: found:
if (found == NULL)
return (NULL);
copy = xstrdup(found); copy = xstrdup(found);
if (modifiers & FORMAT_BASENAME) { if (modifiers & FORMAT_BASENAME) {
saved = copy; saved = copy;
@ -685,7 +687,7 @@ format_replace(struct format_tree *ft, const char *key, size_t keylen,
char *copy, *copy0, *endptr, *ptr, *saved, *trimmed, *value; char *copy, *copy0, *endptr, *ptr, *saved, *trimmed, *value;
size_t valuelen; size_t valuelen;
u_long limit = 0; u_long limit = 0;
int modifiers = 0; int modifiers = 0, brackets;
/* Make a copy of the key. */ /* Make a copy of the key. */
copy0 = copy = xmalloc(keylen + 1); copy0 = copy = xmalloc(keylen + 1);
@ -733,20 +735,26 @@ format_replace(struct format_tree *ft, const char *key, size_t keylen,
goto fail; goto fail;
*ptr = '\0'; *ptr = '\0';
value = saved = format_find(ft, copy + 1, modifiers); value = ptr + 1;
if (value != NULL && *value != '\0' && saved = format_find(ft, copy + 1, modifiers);
(value[0] != '0' || value[1] != '\0')) {
value = ptr + 1; brackets = 0;
ptr = strchr(value, ','); for (ptr = ptr + 1; *ptr != '\0'; ptr++) {
if (ptr == NULL) if (*ptr == '{')
goto fail; brackets++;
*ptr = '\0'; if (*ptr == '}')
} else { brackets--;
ptr = strchr(ptr + 1, ','); if (*ptr == ',' && brackets == 0)
if (ptr == NULL) break;
goto fail;
value = ptr + 1;
} }
if (*ptr == '\0')
goto fail;
if (saved != NULL && *saved != '\0' &&
(saved[0] != '0' || saved[1] != '\0')) {
*ptr = '\0';
} else
value = ptr + 1;
value = format_expand(ft, value); value = format_expand(ft, value);
free(saved); free(saved);
saved = value; saved = value;

2
key-bindings.c
View File

@ -227,7 +227,7 @@ key_bindings_init(void)
"bind -n WheelUpStatus previous-window", "bind -n WheelUpStatus previous-window",
"bind -n MouseDrag1Pane if -Ft= '#{mouse_any_flag}' 'if -Ft= \"#{pane_in_mode}\" \"copy-mode -M\" \"send-keys -M\"' 'copy-mode -M'", "bind -n MouseDrag1Pane if -Ft= '#{mouse_any_flag}' 'if -Ft= \"#{pane_in_mode}\" \"copy-mode -M\" \"send-keys -M\"' 'copy-mode -M'",
"bind -n MouseDown3Pane select-pane -mt=", "bind -n MouseDown3Pane select-pane -mt=",
"bind -n WheelUpPane if-shell -Ft= '#{mouse_any_flag}' 'send-keys -M' 'if -Ft= \"#{pane_in_mode}\" \"send-keys -M\" \"copy-mode -e\"'", "bind -n WheelUpPane if-shell -Ft= '#{mouse_any_flag}' 'send-keys -M' 'if -Ft= \"#{pane_in_mode}\" \"send-keys -M\" \"copy-mode -et=\"'",
}; };
u_int i; u_int i;
struct cmd_list *cmdlist; struct cmd_list *cmdlist;

2
screen.c
View File

@ -194,8 +194,6 @@ screen_resize_y(struct screen *s, u_int sy)
* Now just increase the history size, if possible, to take * Now just increase the history size, if possible, to take
* over the lines which are left. If history is off, delete * over the lines which are left. If history is off, delete
* lines from the top. * lines from the top.
*
* XXX Should apply history limit?
*/ */
available = s->cy; available = s->cy;
if (gd->flags & GRID_HISTORY) if (gd->flags & GRID_HISTORY)