Want straightforward, linear undo/redo in #Emacs and something simpler, faster and more reliable than undo-tree? Try undo-fu. I've been using it for a few weeks now and it's wonderful. https://gitlab.com/ideasman42/emacs-undo-fu