aboutsummaryrefslogtreecommitdiff
path: root/tmux.h
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2017-08-16 14:01:15 +0100
committerThomas Adam <thomas@xteddy.org>2017-08-16 14:01:15 +0100
commit2103a09430142725ea933dcf434c79460ab419f1 (patch)
treea5ee1d7b8a303078b713a891edc0a177082522bb /tmux.h
parent0824850bbce86c395230700cb10c81f162319858 (diff)
parentc6a8ad23a14034ee956bcb45748f743ef5d0c1fc (diff)
downloadrtmux-2103a09430142725ea933dcf434c79460ab419f1.tar.gz
rtmux-2103a09430142725ea933dcf434c79460ab419f1.tar.bz2
rtmux-2103a09430142725ea933dcf434c79460ab419f1.zip
Merge branch 'obsd-master'
Diffstat (limited to 'tmux.h')
-rw-r--r--tmux.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/tmux.h b/tmux.h
index 2ce80843..1989fc55 100644
--- a/tmux.h
+++ b/tmux.h
@@ -81,11 +81,11 @@ struct tmuxproc;
#define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
#endif
-/* Bell option values. */
-#define BELL_NONE 0
-#define BELL_ANY 1
-#define BELL_CURRENT 2
-#define BELL_OTHER 3
+/* Alert option values. */
+#define ALERT_NONE 0
+#define ALERT_ANY 1
+#define ALERT_CURRENT 2
+#define ALERT_OTHER 3
/* Visual option values. */
#define VISUAL_OFF 0
@@ -1874,7 +1874,7 @@ void server_add_accept(int);
/* server-client.c */
u_int server_client_how_many(void);
-void server_client_set_identify(struct client *);
+void server_client_set_identify(struct client *, u_int);
void server_client_clear_identify(struct client *, struct window_pane *);
void server_client_set_key_table(struct client *, const char *);
const char *server_client_get_key_table(struct client *);