about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2000-04-28 17:44:45 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2000-04-28 17:44:45 +0000
commitb7e5949279a4c5f08a8c1460345c05cdb193f5eb (patch)
tree289f1907b3336cbd607e344fe3ef845b01b217d0
parentcd1bde0262de169d712eccafd9784fd3b5bbd342 (diff)
downloadzsh-b7e5949279a4c5f08a8c1460345c05cdb193f5eb.tar.gz
zsh-b7e5949279a4c5f08a8c1460345c05cdb193f5eb.tar.xz
zsh-b7e5949279a4c5f08a8c1460345c05cdb193f5eb.zip
11013: more compinstall fixes
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Core/compinstall5
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 236178dc3..706b715cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-28  Peter Stephenson  <pws@cambridgesiliconradio.com>
+
+	* pws: 11013: Completion/Core/compinstall: more breaks and
+	a completion context.
+
 2000-04-28  Bart Schaefer  <schaefer@zsh.org>
 
 	* 11012: Doc/Zsh/intro.yo, Doc/Zsh/manual.yo: Reorder menus
diff --git a/Completion/Core/compinstall b/Completion/Core/compinstall
index ad266eb59..1c931c808 100644
--- a/Completion/Core/compinstall
+++ b/Completion/Core/compinstall
@@ -2,6 +2,7 @@ emulate -L zsh
 setopt extendedglob
 
 local key
+local compcontext=-default-
 
 __ci_tidyup() {
   unfunction -m __ci_\* 2>/dev/null
@@ -70,7 +71,7 @@ file where these can be found.  Note that this will only work if they
 are exactly the form in which compinstall inserted them.  If you leave
 the line as it is, or empty, I won't search."
   while true;  do
-    vared -ch -p 'file> ' newifile
+    vared -ch -p 'file> ' newifile || break
     if [[ -n $newifile && $ifile != $newifile ]]; then
       if __ci_test_ifile $newifile; then
         foundold=true
@@ -78,6 +79,8 @@ the line as it is, or empty, I won't search."
       fi
       print "I couldn't find any definitions there.  Edit a new filename, or
 leave the line blank to ignore it."
+    else
+      break
     fi
   done
 fi