[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 2.0-39-g23ac383

[Igor Murzov]

The following commit has been merged in the master branch:
commit fdb080ff89195f85e1b76d0752979dfefa777595
Author: wonder.mice <wonder.mice at gmail.com>
Date:   Thu Sep 6 00:47:22 2012 +0400

    Fixed tilde expanding in _filedir_xspec
    
    With this patch completions that use _filedir_xspec will not expand
    tilde when "expand-tilde" option is set to off.
    
    This patch fixes:
    
    1. What:   vim ~/<TAB>
       Before: vim /home/mice/
       After:  vim ~/
    
    2. What:   vim ~/<TAB><TAB>
       Before: vim /home/mice/
               + list of folders and files
       After:  vim ~/
               + list of folders and files
    
    3. What:   vim ~/Doc
       Before: vim /home/mice/Documents/
       After:  vim ~/Documents/

diff --git a/bash_completion b/bash_completion
index f3488ba..335f7a3 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1800,7 +1800,7 @@ _filedir_xspec()
     local cur prev words cword
     _init_completion || return
 
-    _expand || return 0
+    _tilde "$cur" || return 0
 
     local IFS=$'\n' xspec=${_xspecs[${1##*/}]} tmp
     local -a toks

-- 
bash-completion