[nongnu] elpa/goto-chg 8d45a621bf 2/2: Merge pull request #13 from axelf4/read-undo-tree-changesets

[ELPA Syncer]

branch: elpa/goto-chg
commit 8d45a621bf7e99f56a8bc7c526bf6c413520b464
Merge: 3ce1389fea c972e31e13
Author: Vasilij Schneidermann <mail@vasilij.de>
Commit: GitHub <noreply@github.com>

    Merge pull request #13 from axelf4/read-undo-tree-changesets
    
    Consider all entries in undo-tree changesets
---
 goto-chg.el | 99 +++++++++++++++++++++++++------------------------------------
 1 file changed, 40 insertions(+), 59 deletions(-)

diff --git a/goto-chg.el b/goto-chg.el
index a84c23c71e..7f951ea4d5 100644
--- a/goto-chg.el
+++ b/goto-chg.el
@@ -283,72 +283,53 @@ discarded. See variable `undo-limit'."
         ((consp arg)                    ; C-u's multiply previous span by 4
          (setq glc-current-span (* (abs (car arg)) glc-default-span))
          (message "Current span is %d chars" glc-current-span))) ;todo: keep 
message with "waiting" and "is saved"
-  (cond ((< (prefix-numeric-value arg) 0)
-         (setq glc-direction -1))
-        (t
-         (setq glc-direction 1)))
-  (let (rev                             ; Reversed (and filtered) undo list
-        pos                             ; The pos we look for, nil until found
-        (n 0)                           ; Steps in undo list (length of 'rev')
-        (l buffer-undo-list)
-        (passed-save-entry (not (buffer-modified-p)))
-        (new-probe-depth glc-probe-depth)
-        (undo-tree-p (bound-and-true-p undo-tree-mode))
-        glc-seen-canary)
+  (setq glc-direction (if (< (prefix-numeric-value arg) 0) -1 1))
+  (let* (rev                            ; Reversed (and filtered) undo list
+         pos                            ; The pos we look for, nil until found
+         (n 0)                          ; Steps in undo list (length of 'rev')
+         (undo-tree-p (bound-and-true-p undo-tree-mode))
+         (orig-l (if (not undo-tree-p)
+                     buffer-undo-list
+                   (undo-list-transfer-to-tree)
+                   ;; Each node has a list of undo entries: Need to flatten.
+                   ;; Keep current entries and next node to consider in tuple.
+                   (cons nil (undo-tree-current buffer-undo-tree))))
+         (l orig-l)
+         (passed-save-entry (not (buffer-modified-p)))
+         (new-probe-depth glc-probe-depth))
     ;; Walk back and forth in the buffer-undo-list, each time one step deeper,
     ;; until we can walk back the whole list with a 'pos' that is not coming
     ;; too close to another edit.
     (while (null pos)
       (setq new-probe-depth (+ new-probe-depth glc-direction))
-      (if (< glc-direction 0)
-          (setq rev ()
-                n 0
-                l buffer-undo-list
-                passed-save-entry (not (buffer-modified-p))))
-      (if (< new-probe-depth 1)
-          (error "No later change info"))
-      (if (> n 150)
-          (message "working..."))
+      (when (< glc-direction 0)
+        (setq rev ()
+              n 0
+              l orig-l
+              passed-save-entry (not (buffer-modified-p))))
+      (when (< new-probe-depth 1)
+        (error "No later change info"))
+      (when (> n 150)
+        (message "working..."))
       ;; Walk forward in buffer-undo-list, glc-probe-depth steps.
       ;; Build reverse list along the way
-      (if (not undo-tree-p)
-          (while (< n new-probe-depth)
-            (cond ((null l)
-                   ;(setq this-command t)   ; Disrupt repeat sequence
-                   (error "No further change info"))
-                  ((glc-is-positionable (car l))
-                   (setq n (1+ n)
-                         rev (cons (car l) rev)))
-                  ((or passed-save-entry (glc-is-filetime (car l)))
-                   (setq passed-save-entry t)))
-            (setq l (cdr l)))
-        (undo-list-transfer-to-tree)
-        (when (not glc-seen-canary)
-          (while (and (not (null l)) (not glc-seen-canary) (< n 
new-probe-depth))
-            (cond ((eq 'undo-tree-canary (car l))  ; used by buffer-undo-tree
-                   (message "Canary found...")
-                   (setq l (undo-tree-current buffer-undo-tree)
-                         glc-seen-canary t))
-                  ((glc-is-positionable (car l))
-                   (setq n (1+ n)
-                         rev (cons (car l) rev)))
-                  ((or passed-save-entry (glc-is-filetime (car l)))
-                   (setq passed-save-entry t)))
-            (when (not glc-seen-canary)
-              (setq l (cdr l)))))
-        (when glc-seen-canary
-          (while (and (< n new-probe-depth) (eval '(undo-tree-node-p l)))
-            (cond ((null l)
-                   ;(setq this-command t)      ; Disrupt repeat sequence
-                   (error "No further change info"))
-                  ((glc-is-positionable (car (undo-tree-node-undo l)))
-                   (setq n (1+ n)
-                         rev (cons (car (undo-tree-node-undo l)) rev)))
-                  ((or passed-save-entry (glc-is-filetime (car 
(undo-tree-node-undo l))))
-                   (setq passed-save-entry t)))
-            (setq l (undo-tree-node-previous l))))
-        (when (null l)
-          (error "No further change info")))
+      (while (< n new-probe-depth)
+        (let ((entry (if (not undo-tree-p)
+                         (if l
+                             (pop l)
+                           (error "No further change info"))
+                       (when (null (car l))
+                         (setq l (cons (cons nil
+                                             (undo-tree-node-undo
+                                              (or (cdr l)
+                                                  (error "No further change 
info"))))
+                                       (undo-tree-node-previous (cdr l)))))
+                       (pop (car l)))))
+          (cond ((glc-is-positionable entry)
+                 (setq n (1+ n)
+                       rev (cons entry rev)))
+                ((or passed-save-entry (glc-is-filetime entry))
+                 (setq passed-save-entry t)))))
       ;; Walk back in reverse list, from older to newer edits.
       ;; Adjusting pos along the way.
       (setq pos (glc-adjust-list rev)))