[Bash-completion-commits] ./current r1329: Revert r1170, see comments in _expand for details.

[Ville Skyttä]

------------------------------------------------------------
revno: 1329
committer: Ville Skyttä <ville.skytta at iki.fi>
branch nick: current
timestamp: Fri 2009-02-06 23:26:34 +0200
message:
  Revert r1170, see comments in _expand for details.
modified:
  bash_completion
  debian/changelog
-------------- next part --------------
=== modified file 'bash_completion'
--- a/bash_completion	2009-02-03 23:05:23 +0000
+++ b/bash_completion	2009-02-06 21:26:34 +0000
@@ -390,11 +390,12 @@
 	# FIXME: Why was this here?
 	#[ "$cur" != "${cur%\\}" ] && cur="$cur\\"
 
-	# expand ~username type directory specifications
+	# Expand ~username type directory specifications.  We want to expand
+	# ~foo/... to /home/foo/... to avoid problems when $cur starting with
+	# a tilde is fed to commands and ending up quoted instead of expanded.
+
 	if [[ "$cur" == \~*/* ]]; then
-		# Don't expand ~foo at /home/foo/. (See #489720)
-		#eval cur=$cur
-		return
+		eval cur=$cur
 	elif [[ "$cur" == \~* ]]; then
 		cur=${cur#\~}
 		COMPREPLY=( $( compgen -P '~' -u $cur ) )

=== modified file 'debian/changelog'
--- a/debian/changelog	2009-02-05 09:53:04 +0000
+++ b/debian/changelog	2009-02-06 21:26:34 +0000
@@ -20,7 +20,6 @@
     FIXME in source.
   * Dump to /dev/null error message from look(1) with no arguments
     (Closes: #495142)
-  * Don't expand ~foo to /home/foo/ (Closes: #489720)
   * Set ssh as default for rsync (was rsh) (Closes: #492328)
   * Added .oga, .ogv, .ogx to mplayer completion (Closes: #496162)
   * Added .epub to unzip|zipinfo completion (Closes: #492476)