From 848aa741f4f75d9f863c7935ced467cf38cf446f Mon Sep 17 00:00:00 2001 From: Eric Freese Date: Fri, 14 Jun 2019 13:21:06 -0600 Subject: [PATCH] Revert "Merge pull request #439 from zsh-users/fixes/copy-earlier-word" This reverts commit 1c3e3fd939141e89dc68394c6bd165987257bf40, reversing changes made to 733abd4af0f23f217caa2a303fbef66382d19d6f. This PR should have been merged to develop instead of master. --- spec/async_spec.rb | 27 ++------------------------- src/config.zsh | 1 - zsh-autosuggestions.zsh | 1 - 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/spec/async_spec.rb b/spec/async_spec.rb index 0af7232..c4029a1 100644 --- a/spec/async_spec.rb +++ b/spec/async_spec.rb @@ -27,29 +27,6 @@ context 'with asynchronous suggestions enabled' do end end - describe '`copy-earlier-word`' do - let(:before_sourcing) do - -> do - session. - run_command('autoload -Uz copy-earlier-word'). - run_command('zle -N copy-earlier-word'). - run_command('bindkey "^N" copy-earlier-word') - end - end - - it 'should cycle through previous words in the buffer' do - session.clear_screen - session.send_string('foo bar baz') - sleep 0.5 - session.send_keys('C-n') - wait_for { session.content }.to eq('foo bar bazbaz') - session.send_keys('C-n') - wait_for { session.content }.to eq('foo bar bazbar') - session.send_keys('C-n') - wait_for { session.content }.to eq('foo bar bazfoo') - end - end - describe 'pressing ^C after fetching a suggestion' do before do skip 'Workaround does not work below v5.0.8' if session.zsh_version < Gem::Version.new('5.0.8') @@ -57,9 +34,9 @@ context 'with asynchronous suggestions enabled' do it 'terminates the prompt and begins a new one' do session.send_keys('e') - sleep 0.5 + sleep 0.1 session.send_keys('C-c') - sleep 0.5 + sleep 0.1 session.send_keys('echo') wait_for { session.content }.to eq("e\necho") diff --git a/src/config.zsh b/src/config.zsh index 442358f..2f46aed 100644 --- a/src/config.zsh +++ b/src/config.zsh @@ -35,7 +35,6 @@ typeset -g ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX=autosuggest-orig- up-line-or-history down-line-or-history accept-line - copy-earlier-word ) } diff --git a/zsh-autosuggestions.zsh b/zsh-autosuggestions.zsh index 385dd9e..645d00f 100644 --- a/zsh-autosuggestions.zsh +++ b/zsh-autosuggestions.zsh @@ -71,7 +71,6 @@ typeset -g ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX=autosuggest-orig- up-line-or-history down-line-or-history accept-line - copy-earlier-word ) }