about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBart Schaefer <barts@users.sourceforge.net>2006-07-29 23:46:01 +0000
committerBart Schaefer <barts@users.sourceforge.net>2006-07-29 23:46:01 +0000
commitd905d22c655c32e7bc9d7ebb0e50175c671cdbcd (patch)
tree9b3d66bb1fbe89e2dcf6998fac5da1715d8f0f63
parent80a6fa6af5d6ab1017dafe492343a0a07003cc24 (diff)
downloadzsh-d905d22c655c32e7bc9d7ebb0e50175c671cdbcd.tar.gz
zsh-d905d22c655c32e7bc9d7ebb0e50175c671cdbcd.tar.xz
zsh-d905d22c655c32e7bc9d7ebb0e50175c671cdbcd.zip
22561: fix long-standing display bug in incremental-complete-word.
-rw-r--r--ChangeLog7
-rw-r--r--Functions/Zle/incremental-complete-word13
2 files changed, 18 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4c3244251..97fa222a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
 	* 22560: Functions/Zle/history-beginning-search-menu:
diff --git a/Functions/Zle/incremental-complete-word b/Functions/Zle/incremental-complete-word
index 8b8bded39..b1e8e1c52 100644
--- a/Functions/Zle/incremental-complete-word
+++ b/Functions/Zle/incremental-complete-word
@@ -10,6 +10,15 @@
 #
 # 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.
 
 incremental-complete-word() {
@@ -52,7 +61,7 @@ incremental-complete-word() {
     state=''
   fi
   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"
   read -k key
 
@@ -95,7 +104,7 @@ incremental-complete-word() {
         state=''
       fi
       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"
     else
       zle -R