[elpa] externals/undo-tree bff9f31 049/195: Made undo-tree-visualizer-quit select window displaying parent buffer

[Stefan Monnier]

branch: externals/undo-tree
commit bff9f315d604f640c81e6c461e88c0deccabf530
Author: Toby S. Cubitt <toby-undo-tree@dr-qubit.org>
Commit: Toby S. Cubitt <toby-undo-tree@dr-qubit.org>

    Made undo-tree-visualizer-quit select window displaying parent buffer
    after quitting, or switch to parent buffer if no window is displaying it.
---
 undo-tree.el | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/undo-tree.el b/undo-tree.el
index c0fa416..7cecad8 100644
--- a/undo-tree.el
+++ b/undo-tree.el
@@ -495,6 +495,9 @@
 ;; * added match for "No further redo information" to
 ;;   `debug-ignored-errors' to prevent debugger being called on this
 ;;   error
+;; * made `undo-tree-visualizer-quit' select the window displaying the
+;;   visualizer's parent buffer, or switch to the parent buffer if no window
+;;   is displaying it
 ;;
 ;; Version 0.1.6
 ;; * added `undo-tree-mode-lighter' customization option to allow the
@@ -1788,9 +1791,15 @@ using `undo-tree-redo' or `undo-tree-visualizer-redo'."
   (interactive)
   (undo-tree-clear-visualizer-data buffer-undo-tree)
   ;; remove kill visualizer hook from parent buffer
-  (with-current-buffer undo-tree-visualizer-buffer
-    (remove-hook 'before-change-functions 'undo-tree-kill-visualizer t))
-  (kill-buffer nil))
+  (unwind-protect
+      (with-current-buffer undo-tree-visualizer-buffer
+       (remove-hook 'before-change-functions 'undo-tree-kill-visualizer t))
+    (let ((parent undo-tree-visualizer-buffer)
+         window)
+      (kill-buffer nil)
+      (if (setq window (get-buffer-window parent))
+         (select-window window)
+       (switch-to-buffer parent)))))
 
 
 (defun undo-tree-visualizer-set (pos)