@@ -18,10 +18,6 @@ cur=${words[2, -1]} -ret=$(autojump --completion "${cur[*]}") - -if [ "$ret" != "" ]; then # if at least one answer - for i in $(echo "$ret"); do - compadd -U $i # add all of them as possible completion - done -fi +autojump --completion ${cur[*]} | while read i; do + compadd -U $i; +done _j @@ -93,7 +93,7 @@ def open_dic(dic_file,error_recovery=False): #Main code try: - optlist, args = getopt.getopt(argv[1:], 'a',['stat','import','completion']) + optlist, args = getopt.getopt(argv[1:], 'a',['stat','import','completion', 'bash']) except getopt.GetoptError, e: print "Unknown command line argument: %s" % e exit(1) @@ -147,7 +147,7 @@ else: if dead_dirs and not completion: #save the dict if there were some non-existent directories in the database save(path_dict,dic_file) - if completion: quotes='"' + if completion and ('--bash', '') in optlist: quotes='"' else: quotes="" if userchoice!=-1: autojump @@ -21,7 +21,7 @@ _autojump() COMPREPLY=() unset COMP_WORDS[0] #remove "j" from the array cur=${COMP_WORDS[*]} - IFS=$'\n' read -d '' -a COMPREPLY < <(autojump --completion "$cur") + IFS=$'\n' read -d '' -a COMPREPLY < <(autojump --bash --completion "$cur") return 0 } complete -F _autojump j autojump.bash 92ef70ffce5cda7d3781fe274ed8744264081ce8 Joel Schaerer joelthelion@laposte.net http://github.com/joelthelion/autojump/commit/0ec15907e3f63ef09182a8d183832bc26356270c 0ec15907e3f63ef09182a8d183832bc26356270c 2009-10-03T11:25:16-07:00 2009-10-03T11:25:16-07:00 fixes for zsh. Thanks simon!!! 040206df69647d0f27a599fb9269af3dec71e55a Joel Schaerer joelthelion@laposte.net