From 08d2711467f37d08502d8bd3403c469d2794ae32 Mon Sep 17 00:00:00 2001 From: Rafael Fourquet Date: Thu, 27 Jul 2017 14:58:06 +0200 Subject: [PATCH] multispaces defaults to false, and de-activate in search-mode --- base/repl/LineEdit.jl | 6 +++--- test/lineedit.jl | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/base/repl/LineEdit.jl b/base/repl/LineEdit.jl index fd29d7c82b4bf..df03807f5b235 100644 --- a/base/repl/LineEdit.jl +++ b/base/repl/LineEdit.jl @@ -478,7 +478,7 @@ function edit_insert(buf::IOBuffer, c) end end -function edit_backspace(s::PromptState, multispaces::Bool=true) +function edit_backspace(s::PromptState, multispaces::Bool=false) if edit_backspace(s.input_buffer, multispaces) refresh_line(s) else @@ -486,7 +486,7 @@ function edit_backspace(s::PromptState, multispaces::Bool=true) end end -function edit_backspace(buf::IOBuffer, multispaces::Bool=true) +function edit_backspace(buf::IOBuffer, multispaces::Bool=false) oldpos = position(buf) if oldpos > 0 c = char_move_left(buf) @@ -1378,7 +1378,7 @@ AnyDict( end, '\n' => KeyAlias('\r'), # Backspace/^H - '\b' => (s,o...)->edit_backspace(s), + '\b' => (s,o...)->edit_backspace(s, true), 127 => KeyAlias('\b'), # Meta Backspace "\e\b" => (s,o...)->edit_delete_prev_word(s), diff --git a/test/lineedit.jl b/test/lineedit.jl index 6e9c22ab3c17c..db08673822230 100644 --- a/test/lineedit.jl +++ b/test/lineedit.jl @@ -413,24 +413,24 @@ end LineEdit.edit_insert(s, "for x=1:10\n") LineEdit.edit_tab(s) @test bufferdata(s) == "for x=1:10\n " - LineEdit.edit_backspace(s) + LineEdit.edit_backspace(s, true) @test bufferdata(s) == "for x=1:10\n" LineEdit.edit_insert(s, " ") LineEdit.edit_tab(s) @test bufferdata(s) == "for x=1:10\n " LineEdit.edit_insert(s, " ") - LineEdit.edit_backspace(s) + LineEdit.edit_backspace(s, true) @test bufferdata(s) == "for x=1:10\n " LineEdit.edit_insert(s, "éé=3 ") LineEdit.edit_tab(s) @test bufferdata(s) == "for x=1:10\n éé=3 " - LineEdit.edit_backspace(s) + LineEdit.edit_backspace(s, true) @test bufferdata(s) == "for x=1:10\n éé=3" LineEdit.edit_insert(s, "\n 1∉x ") LineEdit.edit_tab(s) @test bufferdata(s) == "for x=1:10\n éé=3\n 1∉x " LineEdit.edit_backspace(s, false) @test bufferdata(s) == "for x=1:10\n éé=3\n 1∉x " - LineEdit.edit_backspace(s) + LineEdit.edit_backspace(s, true) @test bufferdata(s) == "for x=1:10\n éé=3\n 1∉x " end