procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid signaling errors from 'pixel-fill-region'

Browse source 
* lisp/textmodes/pixel-fill.el (pixel-fill-region): Make sure the
selected window displays the current buffer.  This is important
when this function is called inside 'with-current-buffer' or
similar forms which temporarily change the buffer displayed in the
selected window.  (Bug#67791)
This commit is contained in:
Eli Zaretskii 2024-02-03 11:09:36 +02:00
parent a398712761
commit d49124fc14
1 changed files with 35 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
lisp/textmodes/pixel-fill.el
View file

@ -73,39 +73,41 @@ lines that are visually wider than PIXEL-WIDTH.
If START isn't at the start of a line, the horizontal position of
START, converted to pixel units, will be used as the indentation
prefix on subsequent lines."
(save-excursion
(goto-char start)
(let ((indentation
(car (window-text-pixel-size nil (line-beginning-position)
(point))))
(newline-end nil))
(when (> indentation pixel-width)
(error "The indentation (%s) is wider than the fill width (%s)"
indentation pixel-width))
(save-restriction
(narrow-to-region start end)
(goto-char (point-max))
(when (looking-back "\n[ \t]*" (point-min))
(setq newline-end t))
(goto-char (point-min))
;; First replace all whitespace with space.
(while (re-search-forward "[ \t\n]+" nil t)
(cond
((or (= (match-beginning 0) start)
(= (match-end 0) end))
(delete-region (match-beginning 0) (match-end 0)))
;; If there's just a single space here, don't replace.
((not (and (= (- (match-end 0) (match-beginning 0)) 1)
(= (char-after (match-beginning 0)) ?\s)))
(replace-match
;; We need to use a space that has an appropriate width.
(propertize " " 'face
(get-text-property (match-beginning 0) 'face))))))
(goto-char start)
(pixel-fill--fill-line pixel-width indentation)
(goto-char (point-max))
(when newline-end
(insert "\n"))))))
(save-window-excursion
(set-window-buffer nil (current-buffer))
(save-excursion
(goto-char start)
(let ((indentation
(car (window-text-pixel-size nil (line-beginning-position)
(point))))
(newline-end nil))
(when (> indentation pixel-width)
(error "The indentation (%s) is wider than the fill width (%s)"
indentation pixel-width))
(save-restriction
(narrow-to-region start end)
(goto-char (point-max))
(when (looking-back "\n[ \t]*" (point-min))
(setq newline-end t))
(goto-char (point-min))
;; First replace all whitespace with space.
(while (re-search-forward "[ \t\n]+" nil t)
(cond
((or (= (match-beginning 0) start)
(= (match-end 0) end))
(delete-region (match-beginning 0) (match-end 0)))
;; If there's just a single space here, don't replace.
((not (and (= (- (match-end 0) (match-beginning 0)) 1)
(= (char-after (match-beginning 0)) ?\s)))
(replace-match
;; We need to use a space that has an appropriate width.
(propertize " " 'face
(get-text-property (match-beginning 0) 'face))))))
(goto-char start)
(pixel-fill--fill-line pixel-width indentation)
(goto-char (point-max))
(when newline-end
(insert "\n")))))))
(defun pixel-fill--goto-pixel (width)
(vertical-motion (cons (/ width (frame-char-width)) 0)))