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

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	format.c
	osdep-openbsd.c
This commit is contained in:
Thomas Adam
2016-10-12 09:45:49 +01:00
parent 27126f8797 5c49e1d0c1
commit b9dc855016
98 changed files with 2110 additions and 2229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tty-term.c
View File

@ -30,8 +30,8 @@
#include "tmux.h"
void tty_term_override(struct tty_term *, const char *);
char *tty_term_strip(const char *);
static void tty_term_override(struct tty_term *, const char *);
static char *tty_term_strip(const char *);
struct tty_terms tty_terms = LIST_HEAD_INITIALIZER(tty_terms);
@ -56,7 +56,7 @@ struct tty_term_code_entry {
const char *name;
};
const struct tty_term_code_entry tty_term_codes[] = {
static const struct tty_term_code_entry tty_term_codes[] = {
[TTYC_ACSC] = { TTYCODE_STRING, "acsc" },
[TTYC_AX] = { TTYCODE_FLAG, "AX" },
[TTYC_BCE] = { TTYCODE_FLAG, "bce" },
@ -267,7 +267,7 @@ tty_term_ncodes(void)
return (nitems(tty_term_codes));
}
char *
static char *
tty_term_strip(const char *s)
{
const char *ptr;
@ -296,7 +296,7 @@ tty_term_strip(const char *s)
return (xstrdup(buf));
}
void
static void
tty_term_override(struct tty_term *term, const char *overrides)
{
const struct tty_term_code_entry *ent;