mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Partially revert a fill-region-as-paragraph regression

Browse source 
* lisp/textmodes/fill.el (fill-region-as-paragraph): Revert
e186af261 (bug#53537), because it leads to regressions.  (But
leave tests in place.)
This commit is contained in:
Lars Ingebrigtsen 2022-01-26 16:17:49 +01:00
parent 6075ea0b79
commit c9524819ea
2 changed files with 27 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lisp/textmodes/fill.el
View file

@ -714,8 +714,7 @@ space does not end a sentence, so don't break a line there."
(or justify (setq justify (current-justification)))
;; Don't let Adaptive Fill mode alter the fill prefix permanently.
(let ((actual-fill-prefix fill-prefix)
(fill-prefix fill-prefix))
(let ((fill-prefix fill-prefix))
;; Figure out how this paragraph is indented, if desired.
(when (and adaptive-fill-mode
(or (null fill-prefix) (string= fill-prefix "")))
@ -755,18 +754,9 @@ space does not end a sentence, so don't break a line there."
;; This is the actual filling loop.
(goto-char from)
(let ((first t)
linebeg)
(while (< (point) to)
;; On the first line, there may be text in the fill prefix
;; zone (when `fill-prefix' is specified externally, and
;; not computed). In that case, don't consider that area
;; when trying to find a place to put a line break
;; (bug#45720).
(if (not first)
(setq linebeg (point))
(setq first nil
linebeg (+ (point) (length actual-fill-prefix))))
(let (linebeg)
(while (< (point) to)
(setq linebeg (point))
(move-to-column (current-fill-column))
(if (when (and (< (point) to) (< linebeg to))
;; Find the position where we'll break the line.