Comment 8 for bug 324505

Revision history for this message
wonder.mice (wonder-mice) wrote :

Ok, that patch looks better.

Note, however, that the same change must be done in following files:
bash$ grep -rn " _expand" /etc/bash_completion.d/
/etc/bash_completion.d/info:11: _expand || return 0
/etc/bash_completion.d/lrzip:49: _expand || return 0
/etc/bash_completion.d/povray:12: _expand || return 0
/etc/bash_completion.d/man:21: _expand || return 0
/etc/bash_completion.d/xz:53: _expand || return 0
/etc/bash_completion.d/lzop:54: _expand || return 0
/etc/bash_completion.d/rsync:12: _expand || return 0
/etc/bash_completion.d/sshfs:11: _expand || return 0
/etc/bash_completion.d/bzip2:37: _expand || return 0
/etc/bash_completion.d/ssh:347: _expand || return 0
/etc/bash_completion.d/lzma:32: _expand || return 0
/etc/bash_completion.d/dd:25: _expand || return 0
/etc/bash_completion.d/gcc:19: _expand || return 0
/etc/bash_completion.d/findutils:70: _expand || return 0
/etc/bash_completion.d/dpkg:29: _expand || return 0
/etc/bash_completion.d/gzip:41: _expand || return 0

--- /etc/bash_completion.original 2012-08-14 23:08:38.189654426 +0400
+++ /etc/bash_completion 2012-08-23 01:12:13.313643700 +0400
@@ -1596,7 +1596,7 @@
     COMPREPLY=()
     _get_comp_words_by_ref cur

- _expand || return 0
+ _rl_enabled expand-tilde && (_expand || return 0)

     # get first exclusion compspec that matches this command
     xspec=$( awk "/^complete[ \t]+.*[ \t]${1##*/}([ \t]|\$)/ { print \$0; exit }" \