branch: master commit c097822207e3ba8fcf7d4381a761d2fad29ddd0b Author: Toby S. Cubitt <ts...@cantab.net> Commit: Toby S. Cubitt <ts...@cantab.net>
Undo-tree bug-fix release. --- packages/undo-tree/undo-tree.el | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/undo-tree/undo-tree.el b/packages/undo-tree/undo-tree.el index 9e51b03..6cd72f4 100644 --- a/packages/undo-tree/undo-tree.el +++ b/packages/undo-tree/undo-tree.el @@ -4,7 +4,7 @@ ;; Author: Toby Cubitt <toby-undo-t...@dr-qubit.org> ;; Maintainer: Toby Cubitt <toby-undo-t...@dr-qubit.org> -;; Version: 0.7.3 +;; Version: 0.7.4 ;; Keywords: convenience, files, undo, redo, history, tree ;; URL: http://www.dr-qubit.org/emacs.php ;; Repository: http://www.dr-qubit.org/git/undo-tree.git @@ -1426,7 +1426,7 @@ in visualizer." (undo-tree-region-data-redo-end r)))) -(gv-define-setter undo-tree-node-undo-beginning (node val) +(gv-define-setter undo-tree-node-undo-beginning (val node) `(let ((r (plist-get (undo-tree-node-meta-data ,node) :region))) (unless (undo-tree-region-data-p r) (setf (undo-tree-node-meta-data ,node) @@ -1434,7 +1434,7 @@ in visualizer." (setq r (undo-tree-make-region-data))))) (setf (undo-tree-region-data-undo-beginning r) ,val))) -(gv-define-setter undo-tree-node-undo-end (node val) +(gv-define-setter undo-tree-node-undo-end (val node) `(let ((r (plist-get (undo-tree-node-meta-data ,node) :region))) (unless (undo-tree-region-data-p r) (setf (undo-tree-node-meta-data ,node) @@ -1442,7 +1442,7 @@ in visualizer." (setq r (undo-tree-make-region-data))))) (setf (undo-tree-region-data-undo-end r) ,val))) -(gv-define-setter undo-tree-node-redo-beginning (node val) +(gv-define-setter undo-tree-node-redo-beginning (val node) `(let ((r (plist-get (undo-tree-node-meta-data ,node) :region))) (unless (undo-tree-region-data-p r) (setf (undo-tree-node-meta-data ,node) @@ -1450,7 +1450,7 @@ in visualizer." (setq r (undo-tree-make-region-data))))) (setf (undo-tree-region-data-redo-beginning r) ,val))) -(gv-define-setter undo-tree-node-redo-end (node val) +(gv-define-setter undo-tree-node-redo-end (val node) `(let ((r (plist-get (undo-tree-node-meta-data ,node) :region))) (unless (undo-tree-region-data-p r) (setf (undo-tree-node-meta-data ,node) @@ -1503,7 +1503,7 @@ in visualizer." (undo-tree-visualizer-data-marker v)))) -(gv-define-setter undo-tree-node-lwidth (node val) +(gv-define-setter undo-tree-node-lwidth (val node) `(let ((v (plist-get (undo-tree-node-meta-data ,node) :visualizer))) (unless (undo-tree-visualizer-data-p v) (setf (undo-tree-node-meta-data ,node) @@ -1511,7 +1511,7 @@ in visualizer." (setq v (undo-tree-make-visualizer-data))))) (setf (undo-tree-visualizer-data-lwidth v) ,val))) -(gv-define-setter undo-tree-node-cwidth (node val) +(gv-define-setter undo-tree-node-cwidth (val node) `(let ((v (plist-get (undo-tree-node-meta-data ,node) :visualizer))) (unless (undo-tree-visualizer-data-p v) (setf (undo-tree-node-meta-data ,node) @@ -1519,7 +1519,7 @@ in visualizer." (setq v (undo-tree-make-visualizer-data))))) (setf (undo-tree-visualizer-data-cwidth v) ,val))) -(gv-define-setter undo-tree-node-rwidth (node val) +(gv-define-setter undo-tree-node-rwidth (val node) `(let ((v (plist-get (undo-tree-node-meta-data ,node) :visualizer))) (unless (undo-tree-visualizer-data-p v) (setf (undo-tree-node-meta-data ,node) @@ -1527,7 +1527,7 @@ in visualizer." (setq v (undo-tree-make-visualizer-data))))) (setf (undo-tree-visualizer-data-rwidth v) ,val))) -(gv-define-setter undo-tree-node-marker (node val) +(gv-define-setter undo-tree-node-marker (val node) `(let ((v (plist-get (undo-tree-node-meta-data ,node) :visualizer))) (unless (undo-tree-visualizer-data-p v) (setf (undo-tree-node-meta-data ,node) @@ -1556,7 +1556,7 @@ in visualizer." (defmacro undo-tree-node-register (node) `(plist-get (undo-tree-node-meta-data ,node) :register)) -(gv-define-setter undo-tree-node-register (node val) +(gv-define-setter undo-tree-node-register (val node) `(setf (undo-tree-node-meta-data ,node) (plist-put (undo-tree-node-meta-data ,node) :register ,val))) @@ -2252,9 +2252,9 @@ which is defined in the `warnings' library.\n") ;; leading nil to the lists, and have the pointers point to that ;; initially. ;; Note: using '(nil) instead of (list nil) in the `let*' results in - ;; bizarre errors when the code is byte-compiled, where parts of the - ;; lists appear to survive across different calls to this function. - ;; An obscure byte-compiler bug, perhaps? + ;; errors when the code is byte-compiled, presumably because the + ;; Lisp reader generates a single cons, and that same cons gets used + ;; each call. (let* ((region-changeset (list nil)) (r region-changeset) (delta-list (list nil)) @@ -2269,7 +2269,7 @@ which is defined in the `warnings' library.\n") ;; --- initialisation --- (cond ;; if this is a repeated undo in the same region, start pulling changes - ;; from NODE at which undo-in-region branch iss attached, and detatch + ;; from NODE at which undo-in-region branch is attached, and detatch ;; the branch, using it as initial FRAGMENT of branch being constructed (repeated-undo-in-region (setq original-current node