summaryrefslogtreecommitdiff
path: root/plugins/history-substring-search
diff options
context:
space:
mode:
authorAndrew Janke <andrew@apjanke.net>2015-08-17 20:59:39 -0400
committerAndrew Janke <andrew@apjanke.net>2015-08-17 20:59:39 -0400
commit00eb4658304b010afdfa87f74be673c8aced4961 (patch)
tree3d9e7f95f21265c3c60f10cdca720308bb2421c6 /plugins/history-substring-search
parent47d19cc56425aa7c550d845726111ee8bd9520d1 (diff)
parent192de6bcffb0294e19f4203f6f7dc1a7f3e427be (diff)
downloadzsh-00eb4658304b010afdfa87f74be673c8aced4961.tar.gz
zsh-00eb4658304b010afdfa87f74be673c8aced4961.tar.bz2
zsh-00eb4658304b010afdfa87f74be673c8aced4961.zip
Merge branch 'master' into fold-terminalapp-plugin-into-termsupport
Diffstat (limited to 'plugins/history-substring-search')
-rw-r--r--plugins/history-substring-search/README7
-rw-r--r--plugins/history-substring-search/README.markdown7
-rw-r--r--plugins/history-substring-search/history-substring-search.zsh3
3 files changed, 9 insertions, 8 deletions
diff --git a/plugins/history-substring-search/README b/plugins/history-substring-search/README
deleted file mode 100644
index be11adf76..000000000
--- a/plugins/history-substring-search/README
+++ /dev/null
@@ -1,7 +0,0 @@
-To activate this script, load it into an interactive ZSH session:
-
- % source history-substring-search.zsh
-
-See the "history-substring-search.zsh" file for more information:
-
- % sed -n '2,/^$/s/^#//p' history-substring-search.zsh | more
diff --git a/plugins/history-substring-search/README.markdown b/plugins/history-substring-search/README.markdown
new file mode 100644
index 000000000..c154afdce
--- /dev/null
+++ b/plugins/history-substring-search/README.markdown
@@ -0,0 +1,7 @@
+To activate this script, please include it the `plugins` variable within `~/.zshrc`
+
+ `plugins=(git history-substring-search)`
+
+See the "history-substring-search.zsh" file for more information:
+
+ `sed -n '2,/^$/s/^#//p' history-substring-search.zsh | more`
diff --git a/plugins/history-substring-search/history-substring-search.zsh b/plugins/history-substring-search/history-substring-search.zsh
index 22f03dd6d..65f0750db 100644
--- a/plugins/history-substring-search/history-substring-search.zsh
+++ b/plugins/history-substring-search/history-substring-search.zsh
@@ -175,7 +175,6 @@ fi
# implementation details
#-----------------------------------------------------------------------------
-setopt extendedglob
zmodload -F zsh/parameter
#
@@ -284,6 +283,7 @@ if [[ $+functions[_zsh_highlight] -eq 0 ]]; then
fi
function _history-substring-search-begin() {
+ setopt localoptions extendedglob
_history_substring_search_move_cursor_eol=false
_history_substring_search_query_highlight=
@@ -350,6 +350,7 @@ function _history-substring-search-begin() {
}
function _history-substring-search-end() {
+ setopt localoptions extendedglob
_history_substring_search_result=$BUFFER
# move the cursor to the end of the command line