From 517624924831b4268992d75abd72db27a60b7c19 Mon Sep 17 00:00:00 2001
From: tg <tg@mirbsd.org>
Date: Tue, 8 Aug 2006 20:07:53 +0000
Subject: [PATCH] * bind ^T to transpose-chars as documented in the manual
 page,   not to stuff, even if TIOCSTI is available * it's transpose-chars not
 transpose

bug spotted by hondza who wondered that on ^T the line repeats itself forever
---
 edit.c | 6 +-----
 mksh.1 | 8 ++++----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/edit.c b/edit.c
index 8877a1b..0786111 100644
--- a/edit.c
+++ b/edit.c
@@ -5,7 +5,7 @@
 
 #include "sh.h"
 
-__RCSID("$MirOS: src/bin/mksh/edit.c,v 1.34 2006/08/02 14:02:54 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/edit.c,v 1.35 2006/08/08 20:07:52 tg Exp $");
 
 /* tty driver characters we are interested in */
 typedef struct {
@@ -1169,11 +1169,7 @@ static struct x_defbindings const x_defbindings[] = {
 	{ XFUNC_meta_yank,		1,	  'y'	},
 	{ XFUNC_literal,		0, MKCTRL('^')	},
 	{ XFUNC_comment,		1,	  '#'	},
-#if defined(TIOCSTI)
-	{ XFUNC_stuff,			0, MKCTRL('T')	},
-#else
 	{ XFUNC_transpose,		0, MKCTRL('T')	},
-#endif
 	{ XFUNC_complete,		1, MKCTRL('[')	},
 	{ XFUNC_comp_list,		0, MKCTRL('I')	},
 	{ XFUNC_comp_list,		1,	  '='	},
diff --git a/mksh.1 b/mksh.1
index 717edbd..3a9af93 100644
--- a/mksh.1
+++ b/mksh.1
@@ -1,8 +1,8 @@
-.\" $MirOS: src/bin/mksh/mksh.1,v 1.49 2006/08/02 14:02:55 tg Exp $
+.\" $MirOS: src/bin/mksh/mksh.1,v 1.50 2006/08/08 20:07:53 tg Exp $
 .\" $OpenBSD: ksh.1,v 1.116 2006/07/26 10:13:25 jmc Exp $
 .\" $OpenBSD: sh.1tbl,v 1.53 2004/12/10 01:56:56 jaredy Exp $
 .\"
-.Dd August 2, 2006
+.Dd August 8, 2006
 .Dt MKSH 1
 .Os MirBSD
 .Sh NAME
@@ -3300,8 +3300,8 @@ If this option is not set, characters in the range 128\-160 are printed as is,
 which may cause problems in some locales.
 .It Ic gmacs
 Enable gmacs-like command-line editing (interactive shells only).
-Currently identical to emacs editing except that transpose (^T) acts slightly
-differently.
+Currently identical to emacs editing except that transpose-chars (^T) acts
+slightly differently.
 .It Ic ignoreeof
 The shell will not (easily) exit when end-of-file is read;
 .Ic exit