* 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
This commit is contained in:
tg 2006-08-08 20:07:53 +00:00
parent e2e1a01610
commit 5176249248
2 changed files with 5 additions and 9 deletions

6
edit.c
View File

@ -5,7 +5,7 @@
#include "sh.h" #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 */ /* tty driver characters we are interested in */
typedef struct { typedef struct {
@ -1169,11 +1169,7 @@ static struct x_defbindings const x_defbindings[] = {
{ XFUNC_meta_yank, 1, 'y' }, { XFUNC_meta_yank, 1, 'y' },
{ XFUNC_literal, 0, MKCTRL('^') }, { XFUNC_literal, 0, MKCTRL('^') },
{ XFUNC_comment, 1, '#' }, { XFUNC_comment, 1, '#' },
#if defined(TIOCSTI)
{ XFUNC_stuff, 0, MKCTRL('T') },
#else
{ XFUNC_transpose, 0, MKCTRL('T') }, { XFUNC_transpose, 0, MKCTRL('T') },
#endif
{ XFUNC_complete, 1, MKCTRL('[') }, { XFUNC_complete, 1, MKCTRL('[') },
{ XFUNC_comp_list, 0, MKCTRL('I') }, { XFUNC_comp_list, 0, MKCTRL('I') },
{ XFUNC_comp_list, 1, '=' }, { XFUNC_comp_list, 1, '=' },

8
mksh.1
View File

@ -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: 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 $ .\" $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 .Dt MKSH 1
.Os MirBSD .Os MirBSD
.Sh NAME .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. which may cause problems in some locales.
.It Ic gmacs .It Ic gmacs
Enable gmacs-like command-line editing (interactive shells only). Enable gmacs-like command-line editing (interactive shells only).
Currently identical to emacs editing except that transpose (^T) acts slightly Currently identical to emacs editing except that transpose-chars (^T) acts
differently. slightly differently.
.It Ic ignoreeof .It Ic ignoreeof
The shell will not (easily) exit when end-of-file is read; The shell will not (easily) exit when end-of-file is read;
.Ic exit .Ic exit