about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Completion/X/Command/_zathura5
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 36de34da3..2f37a0359 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-09-25  Oliver Freyermuth  <o.freyermuth@xxxxxxxxxxxxxx>
+
+	* 43554 (tweaked): Completion/X/Command/_zathura: Fix zathura
+	completion ignoring multiple plugin directories.
+
 2018-09-25  Oliver Freyermuth  <o.freyermuth@googlemail.com>
 
 	* 43544: Completion/X/Command/_zathura: Fix zathura filename
diff --git a/Completion/X/Command/_zathura b/Completion/X/Command/_zathura
index 64888d013..615488068 100644
--- a/Completion/X/Command/_zathura
+++ b/Completion/X/Command/_zathura
@@ -8,8 +8,7 @@ _zathura_files(){
     ${(Qv)opt_args[(i)-p|--plugins-dir]}(#qN) \
     {/usr/local,/usr,}/lib/zathura(#qN)
   do
-    plugins_files=( $plugins_dir/*.so )
-    (( $#plugins_files )) && break
+    plugins_files+=( $plugins_dir/*.so(N) )
   done
   if [[ -z "${plugins_files}" ]]; then
     _files -g "*.pdf(-.)"
@@ -28,7 +27,7 @@ _zathura_files(){
       supported_filetypes+="${pf:t:r}"
     fi
   done
-  _files -g "*.(${(j.|.)supported_filetypes})(-.)"
+  _files -g "*.(${(j.|.)${(@u)supported_filetypes}})(-.)"
 }
 
 _arguments -s -S \