summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Completion/X/Command/_acroread4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e98c72460..da22b044a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-26  Clint Adams  <clint@zsh.org>
+
+	* 22386: Completion/X/Command/_acroread: fix acroread
+	version detection according to Bart's 22385.
+
 2006-03-25  Wayne Davison  <wayned@users.sourceforge.net>
 
 	* unposted: Src/Zle/zle_thingy.c: fixed undefined function
diff --git a/Completion/X/Command/_acroread b/Completion/X/Command/_acroread
index afcd3188c..c2832d513 100644
--- a/Completion/X/Command/_acroread
+++ b/Completion/X/Command/_acroread
@@ -4,12 +4,12 @@ local curcontext="$curcontext" state line
 
 # Try extracting the version number directly from the executable.
 # (This will fail if the executable is a wrapper script for acroread.)
-local ver=${${${(f)"$(<$commands[$words[1]])"}:#^ver=*}##ver=}
+local ver=${${${(Mf)"$(<$commands[$words[1]])"}:#ver=*}##ver=}
 [[ -n $ver ]] && _acroread_version=$ver
 
 if (( ! $+_acroread_version )); then
   local acropath=${${(s. .)${${(f)"$($words[1] -help 2>&1)"}[1]}}[2]}
-  _acroread_version=${${${(f)"$(<$acropath)"}:#^ver=*}##ver=}
+  _acroread_version=${${${(Mf)"$(<$acropath)"}:#ver=*}##ver=}
 fi
 
 if [[ $_acroread_version == 7.* ]]; then