branch: externals/vundo commit 16a09774ddfbd120d625cdd35fcf480e76e278bb Author: Jimmy Yuen Ho Wong <wyue...@gmail.com> Commit: Jimmy Yuen Ho Wong <wyue...@gmail.com>
Restore selected window after killing vundo buffer --- vundo.el | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/vundo.el b/vundo.el index 1aae18b222..686ede4435 100644 --- a/vundo.el +++ b/vundo.el @@ -821,8 +821,11 @@ Roll back changes if `vundo-roll-back-on-quit' is non-nil." vundo--orig-buffer vundo--prev-mod-list)) (with-current-buffer vundo--orig-buffer (setq-local buffer-read-only nil)) - (let ((orig-buffer vundo--orig-buffer)) + (let* ((orig-buffer vundo--orig-buffer) + (orig-window (get-buffer-window orig-buffer))) (kill-buffer-and-window) + (when (window-live-p orig-window) + (select-window orig-window)) (with-current-buffer orig-buffer (run-hooks 'vundo-post-exit-hook))))) @@ -831,8 +834,11 @@ Roll back changes if `vundo-roll-back-on-quit' is non-nil." (interactive) (with-current-buffer vundo--orig-buffer (setq-local buffer-read-only nil)) - (let ((orig-buffer vundo--orig-buffer)) + (let* ((orig-buffer vundo--orig-buffer) + (orig-window (get-buffer-window orig-buffer))) (kill-buffer-and-window) + (when (window-live-p orig-window) + (select-window orig-window)) (with-current-buffer orig-buffer (run-hooks 'vundo-post-exit-hook))))