diff options
| author | Bruce Yinhe <[email protected]> | 2014-10-06 14:54:33 +0200 |
|---|---|---|
| committer | Bruce Yinhe <[email protected]> | 2014-10-06 14:54:33 +0200 |
| commit | 610c746c0795ec9a96f960ea6461ef56d6d2ee24 (patch) | |
| tree | 34a02f0e9d607368344a328a2506688e68679658 | |
| parent | ac3afd00be9a84a6c30c408256c9c41319c61d8d (diff) | |
| parent | a675467f2bba5c4e7fe643a46d3a48a3cf0b020a (diff) | |
| download | otp-610c746c0795ec9a96f960ea6461ef56d6d2ee24.tar.gz otp-610c746c0795ec9a96f960ea6461ef56d6d2ee24.tar.bz2 otp-610c746c0795ec9a96f960ea6461ef56d6d2ee24.zip | |
Merge branch 'maint'
| -rw-r--r-- | lib/kernel/test/interactive_shell_SUITE.erl | 3 | ||||
| -rw-r--r-- | lib/stdlib/src/edlin.erl | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/kernel/test/interactive_shell_SUITE.erl b/lib/kernel/test/interactive_shell_SUITE.erl index a375adceea..7f6024f642 100644 --- a/lib/kernel/test/interactive_shell_SUITE.erl +++ b/lib/kernel/test/interactive_shell_SUITE.erl @@ -296,6 +296,7 @@ ctrl_keys(doc) -> ["Tests various control keys"]; ctrl_keys(_Conf) when is_list(_Conf) -> Cu=[$\^u], Cw=[$\^w], + Cy=[$\^y], Home=[27,$O,$H], End=[27,$O,$F], rtnode([{putline,""}, @@ -308,6 +309,8 @@ ctrl_keys(_Conf) when is_list(_Conf) -> {putline,"world\"."++Home++"\"hello "}, % test <HOME> {getline,"\"hello world\""}, {putline,"world"++Home++"\"hello "++End++"\"."}, % test <END> + {getline,"\"hello world\""}, + {putline,"\"hello world\""++Cu++Cy++"."}, {getline,"\"hello world\""}] ++wordLeft()++wordRight(),[]). diff --git a/lib/stdlib/src/edlin.erl b/lib/stdlib/src/edlin.erl index be9a4f5107..b3bc5f6d92 100644 --- a/lib/stdlib/src/edlin.erl +++ b/lib/stdlib/src/edlin.erl @@ -390,7 +390,7 @@ do_op(end_of_line, Bef, [C|Aft], Rs) -> do_op(end_of_line, Bef, [], Rs) -> {{Bef,[]},Rs}; do_op(ctlu, Bef, Aft, Rs) -> - put(kill_buffer, Bef), + put(kill_buffer, reverse(Bef)), {{[], Aft}, [{delete_chars, -length(Bef)} | Rs]}; do_op(beep, Bef, Aft, Rs) -> {{Bef,Aft},[beep|Rs]}; |