[elpa] externals/undo-tree 45751ef 050/195: Fixed bug in undo-tree-switch-branch.

[Stefan Monnier]

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

    Fixed bug in undo-tree-switch-branch.
---
 undo-tree.el | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/undo-tree.el b/undo-tree.el
index 7cecad8..4cbe560 100644
--- a/undo-tree.el
+++ b/undo-tree.el
@@ -498,6 +498,7 @@
 ;; * 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
+;; * fixed bug in `undo-tree-switch-branch'
 ;;
 ;; Version 0.1.6
 ;; * added `undo-tree-mode-lighter' customization option to allow the
@@ -550,9 +551,8 @@
 (eval-when-compile (require 'cl))
 
 ;; `characterp' isn't defined in Emacs versions <= 22
-(eval-and-compile
-  (unless (fboundp 'characterp)
-    (defmacro characterp (arg) `(char-valid-p ,arg))))
+(unless (fboundp 'characterp)
+  (defalias 'characterp 'char-valid-p))
 
 
 ;;; =====================================================================
@@ -1306,17 +1306,17 @@ using `undo-tree-redo'."
   ;; sanity check branch number
   (when (<= (undo-tree-num-branches) 1) (error "Not at undo branch point"))
   (when (or (< branch 0) (> branch (1- (undo-tree-num-branches))))
-    (error "Invalid branch number")
+    (error "Invalid branch number"))
 
-    ;; if `buffer-undo-tree' is empty, create initial undo-tree
-    (when (null buffer-undo-tree)
-      (setq buffer-undo-tree (make-undo-tree)))
-    ;; transfer entries accumulated in `buffer-undo-list' to
-    ;; `buffer-undo-tree'
-    (undo-list-transfer-to-tree)
-    ;; switch branch
-    (setf (undo-tree-node-branch (undo-tree-current buffer-undo-tree))
-          branch)))
+  ;; if `buffer-undo-tree' is empty, create initial undo-tree
+  (when (null buffer-undo-tree)
+    (setq buffer-undo-tree (make-undo-tree)))
+  ;; transfer entries accumulated in `buffer-undo-list' to
+  ;; `buffer-undo-tree'
+  (undo-list-transfer-to-tree)
+  ;; switch branch
+  (setf (undo-tree-node-branch (undo-tree-current buffer-undo-tree))
+       branch))
 
 
 (defun undo-tree-set (node)