summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorforsyth <forsyth@vitanuova.com>2011-03-15 23:08:01 +0000
committerforsyth <forsyth@vitanuova.com>2011-03-15 23:08:01 +0000
commit3a78c580bfacbdc12a08507f98b0dfb3c9b78f94 (patch)
treeb2471da01552630d5252cd1a9a06049b859d4a42
parentac8b4d5f4a50fb746cf5b209e94a64c7ec53e912 (diff)
20110315-2307
-rw-r--r--CHANGES2
-rw-r--r--include/version.h2
-rw-r--r--libtk/textw.c8
3 files changed, 8 insertions, 4 deletions
diff --git a/CHANGES b/CHANGES
index ea820309..a156b014 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+20110315
+ libtk/textw.c - fix mysterious control characters for editing (D and K) [issue 253, fix from mechiel]
20110225
split emu.h from lib9.h for all platforms
kproc in emu is now a void type as in os
diff --git a/include/version.h b/include/version.h
index a5e79863..fa566af1 100644
--- a/include/version.h
+++ b/include/version.h
@@ -1 +1 @@
-#define VERSION "Fourth Edition (20110301)"
+#define VERSION "Fourth Edition (20110315)"
diff --git a/libtk/textw.c b/libtk/textw.c
index 141273fb..62ffdf9f 100644
--- a/libtk/textw.c
+++ b/libtk/textw.c
@@ -98,15 +98,15 @@ static TkEbind tktbinds[] = {
{TkKey|CNTL('<'), "%W tkTextSetCursor {insert linestart}"},
{TkKey|CNTL('b'), "%W tkTextSetCursor insert-1c"},
{TkKey|Left, "%W tkTextSetCursor insert-1c"},
- {TkKey|CNTL('d'), "%W delete insert"},
+ {TkKey|CNTL('d'), "%W tkTextDelIns"},
{TkKey|CNTL('e'), "%W tkTextSetCursor {insert lineend}"},
{TkKey|End, "%W tkTextSetCursor {insert lineend}"},
{TkKey|CNTL('>'), "%W tkTextSetCursor {insert lineend}"},
{TkKey|CNTL('f'), "%W tkTextSetCursor insert+1c"},
{TkKey|Right, "%W tkTextSetCursor insert+1c"},
{TkKey|CNTL('h'), "%W tkTextDelIns -c"},
- {TkKey|DEL, "%W tkTextDelIns +c"},
- {TkKey|CNTL('k'), "%W delete insert {insert lineend}"},
+ {TkKey|DEL, "%W tkTextDelIns"},
+ {TkKey|CNTL('k'), "%W tkTextDelIns +l"},
{TkKey|CNTL('n'), "%W tkTextSetCursor {insert+1l}"},
{TkKey|Down, "%W tkTextSetCursor {insert+1l}"},
{TkKey|CNTL('o'), "%W tkTextInsert {\n}; %W mark set insert insert-1c"},
@@ -2613,6 +2613,8 @@ tktextdelins(Tk *tk, char *arg, char **val)
sprint(buf, "insert-%dc insert", n);
tktextdelete(tk, buf, nil);
}
+ else if(arg[0] == '+' && arg[1] == 'l')
+ tktextdelete(tk, "insert {insert lineend}", nil);
else
tktextdelete(tk, "insert", nil);
tktextsee(tk, "insert", nil);