branch: elpa/undo-fu-session
commit ae94c87b3f6f0ac0639005f506762866e65dcf9a
Author: Campbell Barton <ideasma...@gmail.com>
Commit: Campbell Barton <ideasma...@gmail.com>
Revert "Cleanup: let bind cons-cell variables"
This reverts commit 2355a4c6618c80cd79f4a420341ee54e5ce67dc3.
This somehow prevented markers from saving.
---
undo-fu-session.el | 44 +++++++++++++++++++++-----------------------
1 file changed, 21 insertions(+), 23 deletions(-)
diff --git a/undo-fu-session.el b/undo-fu-session.el
index ad205e4aab..5d08371f86 100755
--- a/undo-fu-session.el
+++ b/undo-fu-session.el
@@ -269,29 +269,27 @@ ignoring all branches that aren't included in the current
undo state."
(lambda (a)
(cond
((consp a)
- (let ((a-car (car a))
- (a-cdr (cdr a)))
- (cond
- ((eq a-car 'marker)
- (set-marker (make-marker) a-cdr))
- ((eq a-car 'marker*)
- (let ((marker (make-marker)))
- (set-marker marker a-cdr)
- (set-marker-insertion-type marker t)
- marker))
- ((eq a-car 'overlay)
- (let ((beg (car a-cdr))
- (end (car (cdr a-cdr))))
- (cond
- ((and beg end)
- (make-overlay beg end))
- ;; Make deleted overlay
- (t
- (let ((overlay (make-overlay (point-min) (point-min))))
- (delete-overlay overlay)
- overlay)))))
- (t
- a))))
+ (cond
+ ((eq (car a) 'marker)
+ (set-marker (make-marker) (cdr a)))
+ ((eq (car a) 'marker*)
+ (let ((marker (make-marker)))
+ (set-marker marker (cdr a))
+ (set-marker-insertion-type marker t)
+ marker))
+ ((eq (car a) 'overlay)
+ (let ((beg (cadr a))
+ (end (caddr a)))
+ (cond
+ ((and beg end)
+ (make-overlay beg end))
+ ;; Make deleted overlay
+ (t
+ (let ((overlay (make-overlay (point-min) (point-min))))
+ (delete-overlay overlay)
+ overlay)))))
+ (t
+ a)))
(t
a)))
tree))))
