diff options
Diffstat (limited to 'pearl.el')
| -rw-r--r-- | pearl.el | 21 |
1 files changed, 18 insertions, 3 deletions
@@ -3447,6 +3447,15 @@ Surface BUFFER when any field pushed. The shared close-out for (message "%s: %s" label (pearl--save-summary-message outcomes)) (when pushed (pearl--surface-buffer buffer)))) +(defun pearl--marker-live-p (marker) + "Non-nil if MARKER is nil, or points into a still-live buffer. +A nil MARKER (synthetic callers with no buffer) passes; a marker into a killed +buffer fails. Guards async commit callbacks that touch the buffer after a push +the buffer may not have survived." + (or (null marker) + (let ((buffer (marker-buffer marker))) + (and buffer (buffer-live-p buffer))))) + (defun pearl--run-atomic-field-save (spec callback) "Save one atomic (enum/relation) field per SPEC, calling CALLBACK once. SPEC keys: :issue-id :identifier :field :marker :label; :live and :baseline @@ -3467,11 +3476,15 @@ baseline is `unchanged'; otherwise the remote is fetched (`:error' -> (let* ((live (plist-get spec :live)) (baseline (plist-get spec :baseline)) (equal-fn (or (plist-get spec :equal) #'equal)) + (marker (plist-get spec :marker)) (push-then-commit (lambda (cb) (funcall (plist-get spec :push) (lambda (r) - (when (plist-get r :success) + ;; The push can land after the buffer was killed; only run + ;; the buffer-touching commit when it's still live, but + ;; still report the remote success either way. + (when (and (plist-get r :success) (pearl--marker-live-p marker)) (funcall (plist-get spec :commit-local))) (funcall cb (plist-get r :success))))))) (cond @@ -3487,7 +3500,8 @@ baseline is `unchanged'; otherwise the remote is fetched (`:error' -> ((eq remote :error) (funcall callback (pearl--save-outcome spec 'failed 'fetch-failed))) ((funcall equal-fn remote live) - (funcall (plist-get spec :commit-local)) + (when (pearl--marker-live-p marker) + (funcall (plist-get spec :commit-local))) (funcall callback (pearl--save-outcome spec 'unchanged nil))) ((funcall equal-fn remote baseline) (funcall push-then-commit @@ -3501,7 +3515,8 @@ baseline is `unchanged'; otherwise the remote is fetched (`:error' -> (plist-get spec :live-display) (funcall (plist-get spec :remote-display) remote) push-then-commit - (lambda () (funcall (plist-get spec :commit-remote) remote)) + (lambda () (when (pearl--marker-live-p marker) + (funcall (plist-get spec :commit-remote) remote))) (lambda (status reason) (funcall callback (pearl--save-outcome spec status reason)))))))))))) |