mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-01-19 23:41:31 +01:00
Code Releases Activity

22561: fix long-standing display bug in incremental-complete-word.

Browse source
This commit is contained in:
Bart Schaefer 2006-07-29 23:46:01 +00:00
parent 80a6fa6af5
commit d905d22c65
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2006-07-29 Barton E. Schaefer <schaefer@brasslantern.com>
* 22561: Functions/Zle/incremental-complete-word: fix display bug
introduced roughly five years ago when _main_complete was changed
to remove the leading underscore from $_lastcomp[completer]. Add
some other commentary.
2006-07-28 Peter Stephenson <pws@csr.com> 2006-07-28 Peter Stephenson <pws@csr.com>
* 22560: Functions/Zle/history-beginning-search-menu: * 22560: Functions/Zle/history-beginning-search-menu:

13
Functions/Zle/incremental-complete-word
View file

@ -10,6 +10,15 @@
# #
# This works only with the new function based completion system. # This works only with the new function based completion system.
# Recommended settings:
# zstyle ':completion:incremental:*' completer _complete _ignored
# zstyle :incremental stop-keys $'[\e\C-b\C-f\C-n\C-p\C-u-\C-x]'
# BUGS:
# The _oldlist completer breaks incremental completion. Use a context-
# specific completer zstyle as shown above to disable the _oldlist
# completer in this function.
# The main widget function. # The main widget function.
incremental-complete-word() { incremental-complete-word() {
@ -52,7 +61,7 @@ incremental-complete-word() {
state='' state=''
fi fi
zformat -f pstr "$pmpt" "u:${word}" "s:$state" "n:$num" \ zformat -f pstr "$pmpt" "u:${word}" "s:$state" "n:$num" \
"l:$toolong" "c:${_lastcomp[completer][2,-1]}" "l:$toolong" "c:${_lastcomp[completer]}"
zle -R "$pstr" zle -R "$pstr"
read -k key read -k key
@ -95,7 +104,7 @@ incremental-complete-word() {
state='' state=''
fi fi
zformat -f pstr "$pmpt" "u:${word}" "s:$state" "n:$num" \ zformat -f pstr "$pmpt" "u:${word}" "s:$state" "n:$num" \
"l:$toolong" "c:${_lastcomp[completer][2,-1]}" "l:$toolong" "c:${_lastcomp[completer]}"
zle -R "$pstr" zle -R "$pstr"
else else
zle -R zle -R