[Bash-completion-commits] ./current r1167: (Partly) fixed java classes completion (Closes: #496828). Look for

[David Paleino]

------------------------------------------------------------
revno: 1167
committer: David Paleino <d.paleino at gmail.com>
branch nick: current
timestamp: Sat 2008-09-06 15:57:15 +0200
message:
  (Partly) fixed java classes completion (Closes: #496828). Look for 
  FIXME in source.
modified:
  bash_completion
  debian/changelog
-------------- next part --------------
=== modified file 'bash_completion'
--- a/bash_completion	2008-09-06 13:00:25 +0000
+++ b/bash_completion	2008-09-06 13:57:15 +0000
@@ -4689,9 +4689,15 @@
 
 		elif [ -d $i ]; then
 			i=${i%/}
+			
+			# See bug #496828
 			COMPREPLY=( "${COMPREPLY[@]}" $( find "$i" -type f \
-			-path "$i/$cur*.class" 2>/dev/null | \
+			-maxdepth 1 -path "$i/$cur*.class" 2>/dev/null | \
 			grep -v "\\$" | sed -e "s|^$i/||" ) )
+			
+			# FIXME: if we have foo.class and foo/, the completion
+			# returns "foo/"... how to give precedence to files
+			# over directories?
 		fi
 	done
 

=== modified file 'debian/changelog'
--- a/debian/changelog	2008-09-06 13:00:25 +0000
+++ b/debian/changelog	2008-09-06 13:57:15 +0000
@@ -3,8 +3,10 @@
   * Added .kar to Timidity completion.
   * Fix killall completion (Closes: #497540)
   * Fix man -l completing filenames (Closes: #497074)
+  * (Partly) fixed java classes completion (Closes: #496828). Look for 
+    FIXME in source.
 
- -- David Paleino <d.paleino at gmail.com>  Sat, 06 Sep 2008 15:00:00 +0200
+ -- David Paleino <d.paleino at gmail.com>  Sat, 06 Sep 2008 15:55:50 +0200
 
 bash-completion (20080705) unstable; urgency=low