From 59d4f94e5d32163943547145fc4605947617f510 Mon Sep 17 00:00:00 2001
From: Tanaka Akira <akr@users.sourceforge.net>
Date: Mon, 14 Feb 2000 10:29:49 +0000
Subject: zsh-workers/9710

---
 Completion/Core/_files      | 2 ++
 Completion/Core/_path_files | 5 ++---
 Src/Modules/zutil.c         | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Completion/Core/_files b/Completion/Core/_files
index ee0b46c1b..821d324d8 100644
--- a/Completion/Core/_files
+++ b/Completion/Core/_files
@@ -35,6 +35,8 @@ if zstyle -s ":completion:${curcontext}:directories" file-patterns tmp &&
   elif [[ "$type" != *[/g]* ]]; then
     type="${type}/"
   fi
+else
+  dopts=()
 fi
 if zstyle -s ":completion:${curcontext}:globbed-files" file-patterns tmp &&
    [[ -n "$tmp" ]]; then
diff --git a/Completion/Core/_path_files b/Completion/Core/_path_files
index 96d7ce6d0..07e75052f 100644
--- a/Completion/Core/_path_files
+++ b/Completion/Core/_path_files
@@ -276,9 +276,9 @@ for prepath in "$prepaths[@]"; do
       if [[ "$sopt" = *[/f]* && ( -o globdots || "$PREFIX" = .* ) ]] &&
 	  zstyle -s ":completion:${curcontext}:paths" special-dirs atmp; then
 	if [[ "$atmp" = (yes|true|1|on) ]]; then
-	  tmp2=( "$tmp2[@]" . .. )
+	  tmp1=( "$tmp1[@]" . .. )
 	elif [[ "$atmp" = .. ]]; then
-	  tmp2=( "$tmp2[@]" .. )
+	  tmp1=( "$tmp1[@]" .. )
         fi
       fi
     fi
@@ -333,7 +333,6 @@ for prepath in "$prepaths[@]"; do
       # if none of the patterns match.
 
       if [[ -z "$tpre$tsuf" && -n "$pre$suf" ]]; then
-        tmp1=( "$tmp2[@]" )
 	pfxsfx=(-S '' "$pfxsfx[@]")
 	break;
       elif [[ "$haspats" = no && -z "$tpre$tsuf" &&
diff --git a/Src/Modules/zutil.c b/Src/Modules/zutil.c
index 6631fc123..d40b0ae4c 100644
--- a/Src/Modules/zutil.c
+++ b/Src/Modules/zutil.c
@@ -155,7 +155,7 @@ setstypat(Style s, char *pat, Patprog prog, char **vals)
 	    tmp = 2;
 	}
     }
-    p->weight = weight + tmp;
+    p->weight = (weight += tmp);
 
     for (qq = NULL, q = s->pats; q && q->weight >= weight;
 	 qq = q, q = q->next);
-- 
cgit 1.4.1