Merge branch 'obsd-master'

1 files changed, 8 insertions, 1 deletions

diff --git a/tmux.h b/tmux.h
index 67951215..dce5f140 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1790,6 +1790,7 @@ enum options_table_type {
 
 struct options_table_entry {
 	const char		 *name;
+	const char		 *alternative_name;
 	enum options_table_type	  type;
 	int			  scope;
 	int			  flags;
@@ -1809,6 +1810,11 @@ struct options_table_entry {
 	const char		 *unit;
 };
 
+struct options_name_map {
+	const char		*from;
+	const char		*to;
+};
+
 /* Common command usages. */
 #define CMD_TARGET_PANE_USAGE "[-t target-pane]"
 #define CMD_TARGET_WINDOW_USAGE "[-t target-window]"
@@ -2041,7 +2047,8 @@ int		 options_remove_or_default(struct options_entry *, int,
 		     char **);
 
 /* options-table.c */
-extern const struct options_table_entry options_table[];
+extern const struct options_table_entry	options_table[];
+extern const struct options_name_map	options_other_names[];
 
 /* job.c */
 typedef void (*job_update_cb) (struct job *);