From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 30 May 2024 23:00:23 +0000 (-0400)
Subject: track-changes.el: Keep a bit more info when logging an error
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c0f1639ba38030745f7e79acb1e30d010506b05f;p=emacs.git

track-changes.el: Keep a bit more info when logging an error

* lisp/emacs-lisp/track-changes.el (track-changes--recover-from-error):
Add arg `info`.
(track-changes-fetch, track-changes--after): Use it to preserve a bit
more information about errors.

(cherry picked from commit 436b344be36152acbac693009c560b6bfb9697a2)
---

diff --git a/lisp/emacs-lisp/track-changes.el b/lisp/emacs-lisp/track-changes.el
index 2824a70586d..958def17a2f 100644
--- a/lisp/emacs-lisp/track-changes.el
+++ b/lisp/emacs-lisp/track-changes.el
@@ -272,7 +272,8 @@ returns nil, otherwise it returns the value returned by FUNC
 and re-enable the TRACKER corresponding to ID."
   (cl-assert (memq id track-changes--trackers))
   (unless (equal track-changes--buffer-size (buffer-size))
-    (track-changes--recover-from-error))
+    (track-changes--recover-from-error
+     `(buffer-size ,track-changes--buffer-size ,(buffer-size))))
   (let ((beg nil)
         (end nil)
         (before t)
@@ -443,7 +444,7 @@ returned to a consistent state."
   "List of errors encountered.
 Each element is a triplet (BUFFER-NAME BACKTRACE RECENT-KEYS).")
 
-(defun track-changes--recover-from-error ()
+(defun track-changes--recover-from-error (&optional info)
   ;; We somehow got out of sync.  This is usually the result of a bug
   ;; elsewhere that causes the before-c-f and after-c-f to be improperly
   ;; paired, or to be skipped altogether.
@@ -452,7 +453,7 @@ Each element is a triplet (BUFFER-NAME BACKTRACE RECENT-KEYS).")
       (message "Recovering from confusing calls to `before/after-change-functions'!")
     (warn "Missing/incorrect calls to `before/after-change-functions'!!
 Details logged to `track-changes--error-log'")
-    (push (list (buffer-name)
+    (push (list (buffer-name) info
                 (let* ((bf (backtrace-frames
                             #'track-changes--recover-from-error))
                        (tail (nthcdr 50 bf)))
@@ -573,7 +574,7 @@ Details logged to `track-changes--error-log'")
                        track-changes--before-end
                        (point-max)))))
         ;; BEG..END is not covered by previous `before-change-functions'!!
-        (track-changes--recover-from-error)
+        (track-changes--recover-from-error `(unexpected-after ,beg ,end ,len))
       ;; Note the new changes.
       (when (< beg (track-changes--state-beg track-changes--state))
         (setf (track-changes--state-beg track-changes--state) beg))