function __commandline_stash -d 'Stash current command line'
    set -g __stash_command_position (commandline -C)
    set -g __stash_command (commandline -b)
    commandline -r ""
end

function __commandline_pop -d 'Pop last stashed command line'
    if not set -q __stash_command
        return
    end
    commandline -r $__stash_command
    if set -q __stash_command_position
        commandline -C $__stash_command_position
    end
    set -e __stash_command
    set -e __stash_command_position
end

function fish_commandline_toggle -d 'Stash current commandline if not empty, otherwise pop last stashed commandline'
    set -l cmd (commandline -b)
    if test "$cmd"
        __commandline_stash
    else
        __commandline_pop
    end
end