From 393b463fc3c3246e9a365d88355b0d386fadadd5 Mon Sep 17 00:00:00 2001
From: Tanaka Akira <akr@users.sourceforge.net>
Date: Fri, 13 Aug 1999 03:52:22 +0000
Subject: zsh-workers:7428

---
 Completion/User/_colors | 12 +++++++-----
 Completion/User/_pbm    |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Completion/User/_colors b/Completion/User/_colors
index 4e9ee2030..797a7d7b3 100644
--- a/Completion/User/_colors
+++ b/Completion/User/_colors
@@ -5,11 +5,13 @@ if (( ! $+_color_cache )); then
 
   # Cache of color names doesn't exist yet, create it.
 
-  if [[ -f /usr/lib/X11/rgb.txt ]]; then
-    file=/usr/lib/X11/rgb.txt
-  elif [[ -f /usr/local/lib/X11/rgb.txt ]]; then
-    file=/usr/local/lib/X11/rgb.txt
-  fi
+  for f in /usr/{,local/,X11R6/,openwin/}lib/X11/rgb.txt
+  do
+    if [[ -f $f ]]; then
+      file=$f
+      break;
+    fi
+  done
 
   if [[ -n "$file" ]]; then
     _color_cache=( "${(@)${(@f)$(< $file)}[2,-1]##*		}" )
diff --git a/Completion/User/_pbm b/Completion/User/_pbm
index 5ee328cd9..9bcbef933 100644
--- a/Completion/User/_pbm
+++ b/Completion/User/_pbm
@@ -116,7 +116,7 @@ if (( $#opts )); then
     # colon-separated list of words. We just execute this list of words
     # as a command with its arguments.
 
-    if [[ "$after" = *:* ]]; then
+    if [[ "$opts[$after]" = *:* ]]; then
       after="${${opts[after]#*:}//:/ }"
       [[ -z "$after" ]] || $=after 
     fi
-- 
cgit 1.4.1