circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-12-24 17:56:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	Makefile
	tty-keys.c
This commit is contained in:
Thomas Adam
2014-04-05 12:36:14 +01:00
parent 806d5dcb17 acef311fe3
commit 0c99c7dbff
19 changed files with 166 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
status.c
View File

@@ -396,9 +396,6 @@ status_replace1(struct client *c, char **iptr, char **optr, char *out,
case '{':
ptr = (char *) "#{";
goto do_replace;
case '#':
*(*optr)++ = '#';
break;
default:
xsnprintf(tmp, sizeof tmp, "#%c", *(*iptr - 1));
ptr = tmp;