Seems to play well when the file is not version controlled, and the buffer empty bug is gone.