about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2007-06-05 09:58:38 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2007-06-05 09:58:38 +0000
commit83bf1b5c995be69e729871a65696ae1248b9f8e5 (patch)
tree48c4391ac1a2844a99f0504fd9818e02959984b1
parentd3731fac38a95846f7150dd12e9bdb7b8ee2aef8 (diff)
downloadzsh-83bf1b5c995be69e729871a65696ae1248b9f8e5.tar.gz
zsh-83bf1b5c995be69e729871a65696ae1248b9f8e5.tar.xz
zsh-83bf1b5c995be69e729871a65696ae1248b9f8e5.zip
Mikael and Phil: 23521, 23522: extra locations for units data
-rw-r--r--ChangeLog6
-rw-r--r--Completion/Unix/Command/_units7
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d60f97583..0734a9cf3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-05  Peter Stephenson  <pws@csr.com>
+
+	* From Mikael Magnusson and Phil Pennock: 23521, 23522:
+	Completion/Unix/Command/_units: extra locations for
+	units data.
+
 2007-06-04  Peter Stephenson  <pws@csr.com>
 
 	* 23519: Completion/Unix/Command/_units: completion for "units".
diff --git a/Completion/Unix/Command/_units b/Completion/Unix/Command/_units
index ef9fea16f..357211642 100644
--- a/Completion/Unix/Command/_units
+++ b/Completion/Unix/Command/_units
@@ -37,9 +37,12 @@ compset -S '[^[:alnum:]]*'
 local datfile
 local -a testfiles
 testfiles=(
-  /usr/share/units.dat		# GNU
-  /usr/local/share/units.dat
+  /usr/share/units.dat		# GNU on Fedora
+  /usr/share/units/units.dat    # on gentoo
+  /usr/share/misc/units.dat     # on Debian
+  /usr/local/share/units.dat    # GNU DIY install
   /usr/share/lib/unittab	# Solaris
+  /usr/share/misc/units.lib     # BSD
 )
 
 datfile=${opt_args[-f]:-${opt_args[--file]}}