andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prefer window-text-pixel-size in erc-fill

Browse source 
* lisp/erc/erc-fill.el (erc-fill--wrap-measure): Using
`buffer-text-pixel-size' for measuring text size in the selected window
can end up triggering a scroll, which then requires imperfect countering
by the scrolltobottom module, especially with regard to the option
`erc-scrolltobottom-all'.  Thanks to Alcor for reporting and helping
with this bug, which was introduced along with fill-wrap in ERC 5.6.
This commit is contained in:
F. Jason Park 2025-08-24 19:27:47 -07:00
parent 54bd2264d3
commit c711ba3c7b
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lisp/erc/erc-fill.el
View file

@ -618,14 +618,20 @@ message has been marked `erc--ephemeral'."
Ignore any `invisible' props that may be present when figuring.
Expect the target region to be free of `line-prefix' and
`wrap-prefix' properties, and expect `display-line-numbers-mode'
to be disabled."
to be disabled. On Emacs 28 and below, return END minus BEG."
;; Rely on `buffer-text-pixel-size' here even for buffers displayed in
;; another window because temporarily selecting such windows via
;; `with-selected-window' seems to interfere with the implementation
;; of `erc-scrolltobottom-all' in ERC 5.6, which needs improvement.
(if (fboundp 'buffer-text-pixel-size)
;; `buffer-text-pixel-size' can move point!
(save-excursion
(save-restriction
(narrow-to-region beg end)
(let* ((buffer-invisibility-spec)
(rv (car (buffer-text-pixel-size))))
(rv (car (if (eq (selected-window) (get-buffer-window))
(window-text-pixel-size)
(buffer-text-pixel-size)))))
(if erc-fill-wrap-use-pixels
(if (zerop rv) 0 (list rv))
(/ rv (frame-char-width))))))