cosmetic change
if $BUFFER is not empty, input normally
add current_branch()
move the user definition of completion