From c7b2bbb92f5625ab51c09bce70d83de79b52db8e Mon Sep 17 00:00:00 2001
From: Andrey Astafyev <dev@246060.ru>
Date: Wed, 21 Dec 2022 13:40:59 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B1=D0=B0=20=D0=BE=D0=BF?=
 =?UTF-8?q?=D1=82=D0=B8=D0=BC=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D0=B8=20=D0=B0?=
 =?UTF-8?q?=D0=B2=D1=82=D0=BE=D0=B4=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 82-completion.zsh | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/82-completion.zsh b/82-completion.zsh
index afff81a..b53da28 100644
--- a/82-completion.zsh
+++ b/82-completion.zsh
@@ -37,16 +37,16 @@ zinit wait'0' lucid light-mode depth'1' for \
 	atload"!_zsh_autosuggest_start" \
 	  zsh-users/zsh-autosuggestions
 
-if [[ -n ${ZSH_MC_SUBSHELL+set} ]] && [[ -n ${SSH_CONNECTION+set} ]]; then
-	zinit light zsh-users/zsh-history-substring-search
-else
-	zstyle ":history-search-multi-word" page-size "$((LINES/2))"
-	zstyle ":plugin:history-search-multi-word" clear-on-cancel "yes"
-	zinit wait'0' lucid light-mode depth'1' for \
-		  zdharma-continuum/history-search-multi-word \
-		atload"bindkey '^[[A' history-substring-search-up; \
-		       bindkey '^[[B' history-substring-search-down; \
-		       bindkey '^K' history-search-multi-word " \
-		  zsh-users/zsh-history-substring-search
+zinit wait'1' lucid light-mode depth'1' for \
+	atload"bindkey '^[[A' history-substring-search-up; \
+	       bindkey '^[[B' history-substring-search-down" \
+	  zsh-users/zsh-history-substring-search
+
+zstyle ':history-search-multi-word' page-size "$((LINES/2))"
+zstyle ':plugin:history-search-multi-word' clear-on-cancel 'yes'
+if [[ -z ${ZSH_HISTORY_SEARCH_MULTI_WORD_MODE+set} ]]; then
+	zinit wait'1' lucid light-mode depth'1' for \
+		atload"bindkey '^K' history-search-multi-word" \
+		  zdharma-continuum/history-search-multi-word
 fi