===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.657
retrieving revision 1.658
diff -u -r1.657 -r1.658
--- src/usr.bin/tmux/tmux.h	2016/10/12 13:24:07	1.657
+++ src/usr.bin/tmux/tmux.h	2016/10/12 14:50:14	1.658
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.657 2016/10/12 13:24:07 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.658 2016/10/12 14:50:14 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -471,37 +471,6 @@
 	MODEKEY_NONE,
 	MODEKEY_OTHER,
 
-	/* Editing keys. */
-	MODEKEYEDIT_BACKSPACE,
-	MODEKEYEDIT_CANCEL,
-	MODEKEYEDIT_COMPLETE,
-	MODEKEYEDIT_CURSORLEFT,
-	MODEKEYEDIT_CURSORRIGHT,
-	MODEKEYEDIT_DELETE,
-	MODEKEYEDIT_DELETELINE,
-	MODEKEYEDIT_DELETETOENDOFLINE,
-	MODEKEYEDIT_DELETEWORD,
-	MODEKEYEDIT_ENDOFLINE,
-	MODEKEYEDIT_ENTER,
-	MODEKEYEDIT_HISTORYDOWN,
-	MODEKEYEDIT_HISTORYUP,
-	MODEKEYEDIT_NEXTSPACE,
-	MODEKEYEDIT_NEXTSPACEEND,
-	MODEKEYEDIT_NEXTWORD,
-	MODEKEYEDIT_NEXTWORDEND,
-	MODEKEYEDIT_PASTE,
-	MODEKEYEDIT_PREVIOUSSPACE,
-	MODEKEYEDIT_PREVIOUSWORD,
-	MODEKEYEDIT_STARTOFLINE,
-	MODEKEYEDIT_SWITCHMODE,
-	MODEKEYEDIT_SWITCHMODEAPPEND,
-	MODEKEYEDIT_SWITCHMODEAPPENDLINE,
-	MODEKEYEDIT_SWITCHMODEBEGINLINE,
-	MODEKEYEDIT_SWITCHMODECHANGELINE,
-	MODEKEYEDIT_SWITCHMODESUBSTITUTE,
-	MODEKEYEDIT_SWITCHMODESUBSTITUTELINE,
-	MODEKEYEDIT_TRANSPOSECHARS,
-
 	/* Menu (choice) keys. */
 	MODEKEYCHOICE_BACKSPACE,
 	MODEKEYCHOICE_BOTTOMLINE,
@@ -527,7 +496,6 @@
 /* Data required while mode keys are in use. */
 struct mode_key_data {
 	struct mode_key_tree   *tree;
-	int			mode;
 };
 #define MODEKEY_EMACS 0
 #define MODEKEY_VI 1
@@ -535,8 +503,6 @@
 /* Binding between a key and a command. */
 struct mode_key_binding {
 	key_code			 key;
-
-	int				 mode;
 	enum mode_key_cmd		 cmd;
 
 	RB_ENTRY(mode_key_binding)	 entry;
@@ -1267,12 +1233,11 @@
 	void		 (*prompt_freefn)(void *);
 	void		*prompt_data;
 	u_int		 prompt_hindex;
+	enum { PROMPT_ENTRY, PROMPT_COMMAND } prompt_mode;
 
 #define PROMPT_SINGLE 0x1
 #define PROMPT_NUMERIC 0x2
 	int		 prompt_flags;
-
-	struct mode_key_data prompt_mdata;
 
 	struct session	*session;
 	struct session	*last_session;