Minor tidying.

diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h
index 92ee002..bc0ce30 100644 (file)
--- a/usr.bin/tmux/tmux.h
+++ b/usr.bin/tmux/tmux.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.832 2018/08/02 07:55:16 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.833 2018/08/02 11:18:34 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -19,8 +19,6 @@
 #ifndef TMUX_H
 #define TMUX_H
 
-#define PROTOCOL_VERSION 8
-
 #include <sys/time.h>
 #include <sys/queue.h>
 #include <sys/tree.h>
@@ -54,6 +52,9 @@ struct session;
 struct tmuxpeer;
 struct tmuxproc;
 
+/* Client-server protocol version. */
+#define PROTOCOL_VERSION 8
+
 /* Default global configuration file. */
 #define TMUX_CONF "/etc/tmux.conf"
 
@@ -821,12 +822,11 @@ struct window {
        int              flags;
 #define WINDOW_BELL 0x1
 #define WINDOW_ACTIVITY 0x2
-/* 0x4 unused */
-#define WINDOW_SILENCE 0x8
-#define WINDOW_ZOOMED 0x1000
-#define WINDOW_FORCEWIDTH 0x2000
-#define WINDOW_FORCEHEIGHT 0x4000
-#define WINDOW_STYLECHANGED 0x8000
+#define WINDOW_SILENCE 0x4
+#define WINDOW_ZOOMED 0x8
+#define WINDOW_FORCEWIDTH 0x10
+#define WINDOW_FORCEHEIGHT 0x20
+#define WINDOW_STYLECHANGED 0x40
 #define WINDOW_ALERTFLAGS (WINDOW_BELL|WINDOW_ACTIVITY|WINDOW_SILENCE)
 
        int              alerts_queued;
@@ -1403,7 +1403,7 @@ struct key_binding {
 RB_HEAD(key_bindings, key_binding);
 
 struct key_table {
-       const char               *name;
+       const char              *name;
        struct key_bindings      key_bindings;
 
        u_int                    references;
@@ -1424,6 +1424,7 @@ enum options_table_type {
        OPTIONS_TABLE_STYLE,
        OPTIONS_TABLE_ARRAY,
 };
+
 enum options_table_scope {
        OPTIONS_TABLE_NONE,
        OPTIONS_TABLE_SERVER,