branch: elpa/diff-ansi
commit 463efc61b44bb34f34e44a1cb028f5f69ac1bed4
Author: Campbell Barton <ideasma...@gmail.com>
Commit: Campbell Barton <ideasma...@gmail.com>
Fix #4: messages from site-file causes multi-process diff to fail
---
changelog.rst | 3 ++-
diff-ansi.el | 5 ++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/changelog.rst b/changelog.rst
index fc7a421daa..45befd9f33 100644
--- a/changelog.rst
+++ b/changelog.rst
@@ -3,8 +3,9 @@
Change Log
##########
-- Development (2024-08-19)
+- Development (2025-02-09)
+ - Fix #4: Message in site-file causes multi-process diff to fail.
- Fix ``ydiff`` defaulting to 80 column width.
- Fix an error, attempting to use a closed buffer when ``diff-ansi-method``
is set to ``'progressive``.
diff --git a/diff-ansi.el b/diff-ansi.el
index 78782719e5..b6044fee1d 100644
--- a/diff-ansi.el
+++ b/diff-ansi.el
@@ -801,7 +801,10 @@ Store the result in TARGET-BUF when non-nil."
(let ((output (concat temp-dir (number-to-string i))))
(write-region point-prev (point) output nil 0)
- (push (list emacs-bin "--batch" output "--eval"
emacs-eval-arg) per-chunk-args))
+ ;; The "site-file" can cause messages that break our logic
+ ;; which requires predictable process output, see: #4.
+ (push (list emacs-bin "--no-site-file" "--batch" output
"--eval" emacs-eval-arg)
+ per-chunk-args))
(setq i (1+ i)))
(setq per-chunk-args (nreverse per-chunk-args))))
