summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Src/Zle/computil.c3
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ecb608ea4..8503d7f03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-04-03  Sven Wischnowsky <wischnow@informatik.hu-berlin.de>
 
+	* 10465: Src/Zle/computil.c: fix for completion of options
+	after option with rest-arguments
+
 	* 10463: Src/builtin.c, Src/params.c, Src/zsh.h: PM_HASHELEM
 	flag to keep association elements from being exported with
 	ALL_EXPORT set
diff --git a/Src/Zle/computil.c b/Src/Zle/computil.c
index 828fe36d0..e73fe8eaf 100644
--- a/Src/Zle/computil.c
+++ b/Src/Zle/computil.c
@@ -1427,7 +1427,8 @@ bin_comparguments(char *nam, char **args, char *ops, int func)
 	if ((ca_laststate.opt || (ca_laststate.doff && ca_laststate.def) ||
 	     (ca_laststate.def &&
 	      (ca_laststate.def->type == CAA_OPT ||
-	       ca_laststate.def->type >= CAA_RARGS))) &&
+	       (ca_laststate.def->type >= CAA_RARGS &&
+		ca_laststate.def->num < 0)))) &&
 	    (!ca_laststate.def || ca_laststate.def->type < CAA_RARGS ||
 	     (ca_laststate.def->type == CAA_RARGS ?
 	      (ca_laststate.curpos == ca_laststate.argbeg + 1) :