Merge branch 'obsd-master'

1 files changed, 2 insertions, 2 deletions

diff --git a/tmux.h b/tmux.h
index 9b3bf216..6119e8a8 100644
--- a/tmux.h
+++ b/tmux.h
@@ -259,6 +259,7 @@ enum {
 /* Termcap codes. */
 enum tty_code_code {
 	TTYC_ACSC,
+	TTYC_AM,
 	TTYC_AX,
 	TTYC_BCE,
 	TTYC_BEL,
@@ -479,7 +480,6 @@ enum tty_code_code {
 	TTYC_TSL,
 	TTYC_U8,
 	TTYC_VPA,
-	TTYC_XENL,
 	TTYC_XT
 };
 
@@ -1258,7 +1258,7 @@ struct tty_term {
 	struct tty_code	*codes;
 
 #define TERM_256COLOURS 0x1
-#define TERM_NOXENL 0x2
+#define TERM_NOAM 0x2
 #define TERM_DECSLRM 0x4
 #define TERM_DECFRA 0x8
 #define TERM_RGBCOLOURS 0x10