[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#45380: 28.0.50; Error in coloured output in Emacs 28.05(AUR package:
From: |
miha |
Subject: |
bug#45380: 28.0.50; Error in coloured output in Emacs 28.05(AUR package: emacs-git) |
Date: |
Mon, 25 Oct 2021 14:27:15 +0200 |
Morgan Smith <Morgan.J.Smith@outlook.com> writes:
> Ya I sent a bug report (46332) about this exact same thing happening.
> And then you fixed it so that it happened much less often. I didn't
> notice until like a day after we closed that issue. My guess is that
> there are two unrelated bugs that exhibit the exact same behavior and
> you already fixed one.
I read that bug report and looked into this. As you said, there were two
bugs exhibiting similar behaviour. One was in ansi-color, fixed by Lars
in that bug report. The other bug, not yet fixed, is with esh-mode.el.
It uses 'insert-before-markers' to insert process output, pushing
forward the marker used by ansi-color.
A reliable reproducer is to open eshell and execute
sh -c "printf 'NORMAL \033[32m'; sleep 1; printf 'GREEN \033[m\n'"
Please find the attached patch which fixes this.
From 3cda385ffd292ade869abf7e39cbb45ca10349fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miha=20Rihtar=C5=A1i=C4=8D?= <miha@kamnitnik.top>
Date: Mon, 25 Oct 2021 14:09:30 +0200
Subject: [PATCH] Avoid insert-before-markers in eshell
* lisp/eshell/esh-mode.el (eshell-mode): Make window point advance on
insertion.
(eshell-output-filter): Don't use insert-before-markers.
---
lisp/eshell/esh-mode.el | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el
index 579b01f4d1..2b5a4647e0 100644
--- a/lisp/eshell/esh-mode.el
+++ b/lisp/eshell/esh-mode.el
@@ -315,6 +315,8 @@ eshell-mode
(setq-local bookmark-make-record-function #'eshell-bookmark-make-record)
(setq local-abbrev-table eshell-mode-abbrev-table)
+ (setq-local window-point-insertion-type t)
+
(setq-local list-buffers-directory (expand-file-name default-directory))
;; always set the tab width to 8 in Eshell buffers, since external
@@ -696,13 +698,10 @@ eshell-output-filter
(setq oend (+ oend nchars)))
;; Let the ansi-color overlay hooks run.
(let ((inhibit-modification-hooks nil))
- (insert-before-markers string))
+ (insert string))
(if (= (window-start) (point))
(set-window-start (selected-window)
(- (point) nchars)))
- (if (= (point) eshell-last-input-end)
- (set-marker eshell-last-input-end
- (- eshell-last-input-end nchars)))
(set-marker eshell-last-output-start ostart)
(set-marker eshell-last-output-end (point))
(force-mode-line-update))
--
2.33.0
signature.asc
Description: PGP signature