Fix restoring undotree in command-line window
Merge branch 'fix-undo-cmd' into master