Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-17 10:27:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

(fill-region-as-paragraph): When we take one word

Browse source 
after the fill column, don't stop at period with just one space.
When checking whether at beginning of line, if no fill prefix,
ignore intervening whitespace.
This commit is contained in:
Richard M. Stallman 1993-08-02 05:55:56 +00:00
parent 4524cb1c30
commit 47f3858d11
1 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
lisp/textmodes/fill.el
View file

@ -165,12 +165,24 @@ From program, pass args FROM, TO and JUSTIFY-FLAG."
(eq (char-after (- (point) 2)) ?\.))
(forward-char -2)
(skip-chars-backward "^ \n" linebeg))
(if (if (zerop prefixcol) (bolp) (>= prefixcol (current-column)))
(if (if (zerop prefixcol)
(save-excursion
(skip-chars-backward " " linebeg)
(bolp))
(>= prefixcol (current-column)))
;; Keep at least one word even if fill prefix exceeds margin.
;; This handles all but the first line of the paragraph.
(progn
(skip-chars-forward " ")
(skip-chars-forward "^ \n"))
;; Meanwhile, don't stop at a period followed by one space.
(let ((first t))
(move-to-column prefixcol)
(while (and (not (eobp))
(or first
(and (not (bobp))
(save-excursion (forward-char -1)
(looking-at "\\. ")))))
(skip-chars-forward " ")
(skip-chars-forward "^ \n")
(setq first nil)))
;; Normally, move back over the single space between the words.
(forward-char -1))
(if (and fill-prefix (zerop prefixcol)
@ -179,9 +191,16 @@ From program, pass args FROM, TO and JUSTIFY-FLAG."
(substring fill-prefix 0 (- (point) (point-min)))))
;; Keep at least one word even if fill prefix exceeds margin.
;; This handles the first line of the paragraph.
(progn
(skip-chars-forward " ")
(skip-chars-forward "^ \n"))))
;; Don't stop at a period followed by just one space.
(let ((first t))
(while (and (not (eobp))
(or first
(and (not (bobp))
(save-excursion (forward-char -1)
(looking-at "\\. ")))))
(skip-chars-forward " ")
(skip-chars-forward "^ \n")
(setq first nil)))))
;; Replace all whitespace here with one newline.
;; Insert before deleting, so we don't forget which side of
;; the whitespace point or markers used to be on.