mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-03 08:30:09 +00:00
Code Issues Releases Activity

Fix pixel-fill--fill-line infloop for certain unbreakable lines

Browse Source 
* lisp/textmodes/pixel-fill.el (pixel-fill--fill-line): Fix
infloops for certain line widths (bug#52271).
This commit is contained in:
Lars Ingebrigtsen 2021-12-04 20:38:22 +01:00
parent 3bfd8e4007
commit 08782d58db
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lisp/textmodes/pixel-fill.el
View File

@ -116,15 +116,13 @@ prefix on subsequent lines."
(while (not (eolp)) (while (not (eolp))
;; We have to do some folding. First find the first previous ;; We have to do some folding. First find the first previous
;; point suitable for folding. ;; point suitable for folding.
(if (or (not (pixel-fill-find-fill-point (line-beginning-position))) (when (or (not (pixel-fill-find-fill-point (line-beginning-position)))
(= (point) start)) (= (point) start))
;; We had unbreakable text (for this width), so just go to ;; We had unbreakable text (for this width), so just go to
;; the first space and carry on. ;; the first space and carry on.
(progn (beginning-of-line)
(beginning-of-line) (skip-chars-forward " ")
(skip-chars-forward " ") (search-forward " " (line-end-position) 'move))
(search-forward " " (line-end-position) 'move)))
;; Success; continue.
(when (= (preceding-char) ?\s) (when (= (preceding-char) ?\s)
(delete-char -1)) (delete-char -1))
(unless (eobp) (unless (eobp)
@ -133,7 +131,8 @@ prefix on subsequent lines."
(insert (propertize " " 'display (insert (propertize " " 'display
(list 'space :align-to (list indentation)))))) (list 'space :align-to (list indentation))))))
(setq start (point)) (setq start (point))
(pixel-fill--goto-pixel width)))) (unless (eobp)
(pixel-fill--goto-pixel width)))))
(define-inline pixel-fill--char-breakable-p (char) (define-inline pixel-fill--char-breakable-p (char)
"Return non-nil if a line can be broken before and after CHAR." "Return non-nil if a line can be broken before and after CHAR."