From d8f703027345170c7bc820ed7808e693dd1377d6 Mon Sep 17 00:00:00 2001
From: Tanaka Akira <akr@users.sourceforge.net>
Date: Sat, 25 Mar 2000 00:21:44 +0000
Subject: zsh-3.1.6-dev-20

---
 Functions/Prompts/.distfiles            |  2 +-
 Functions/Zle/incremental-complete-word | 16 +++++++++++++---
 Functions/Zle/predict-on                |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

(limited to 'Functions')

diff --git a/Functions/Prompts/.distfiles b/Functions/Prompts/.distfiles
index 1a4310aa8..67a71ae32 100644
--- a/Functions/Prompts/.distfiles
+++ b/Functions/Prompts/.distfiles
@@ -1,6 +1,6 @@
 DISTFILES_SRC='
     .distfiles
-    prompt_elite2_setup prompt_adam1_setup prompt_fade_setup
+    prompt_elite2_setup prompt_adam1_setup prompt_bart_setup prompt_fade_setup
     prompt_elite_setup prompt_redhat_setup prompt_adam2_setup
     prompt_fire_setup prompt_suse_setup prompt_bigfade_setup
     prompt_oliver_setup prompt_off_setup prompt_zefram_setup
diff --git a/Functions/Zle/incremental-complete-word b/Functions/Zle/incremental-complete-word
index f69af52d5..c01bc4f6b 100644
--- a/Functions/Zle/incremental-complete-word
+++ b/Functions/Zle/incremental-complete-word
@@ -17,7 +17,7 @@ incremental-complete-word() {
   unsetopt autolist menucomplete automenu # doesn't work well
 
   local key lbuf="$LBUFFER" rbuf="$RBUFFER" pmpt pstr word
-  local lastl lastr wid twid num post toolong
+  local lastl lastr wid twid num alt post toolong
   local curcontext="${curcontext}" stop brk
 
   [[ -z "$curcontext" ]] && curcontext=:::
@@ -41,6 +41,10 @@ incremental-complete-word() {
   LBUFFER="$lbuf"
   RBUFFER="$rbuf"
   num=$_lastcomp[nmatches]
+  if (( ! num )); then
+    num="${_lastcomp[alternate_nmatches]}"
+    alt=' -alt-'
+  fi
   if (( ! num )); then
     word=''
     state='-no match-'
@@ -51,7 +55,7 @@ incremental-complete-word() {
     word="${_lastcomp[unambiguous]}"
     state=''
   fi
-  zformat -f pstr "$pmpt" "u:${word}" "s:$state" "n:$num" \
+  zformat -f pstr "$pmpt" "u:${word}" "s:$state" "n:$num" "a:$alt" \
                           "l:$toolong" "c:${_lastcomp[completer][2,-1]}"
   zle -R "$pstr"
   read -k key
@@ -83,6 +87,12 @@ incremental-complete-word() {
     LBUFFER="$lastl"
     RBUFFER="$lastr"
     num=$_lastcomp[nmatches]
+    if (( ! num )); then
+      num="${_lastcomp[alternate_nmatches]}"
+      alt=' -alt-'
+    else
+      alt=''
+    fi
     if (( ! num )); then
       word=''
       state='-no match-'
@@ -93,7 +103,7 @@ incremental-complete-word() {
       word="${_lastcomp[unambiguous]}"
       state=''
     fi
-    zformat -f pstr "$pmpt" "u:${word}" "s:$state" "n:$num" \
+    zformat -f pstr "$pmpt" "u:${word}" "s:$state" "n:$num" "a:$alt" \
                             "l:$toolong" "c:${_lastcomp[completer][2,-1]}"
     zle -R "$pstr"
     read -k key
diff --git a/Functions/Zle/predict-on b/Functions/Zle/predict-on
index c56198a55..de22c5170 100644
--- a/Functions/Zle/predict-on
+++ b/Functions/Zle/predict-on
@@ -131,7 +131,7 @@ predict-limit-list() {
   then
     compstate[list]=''
     compstate[force_list]=yes
-  elif zstyle -t ":completion:::predict::" list always
+  elif zstyle -t ":completion:predict::::" list always
   then
     compstate[force_list]=yes
   fi
-- 
cgit 1.4.1