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

(fill-paragraph): Give up if there's no paragraph at or after point.

Browse source
This commit is contained in:
Stefan Monnier 2002-10-03 23:01:51 +00:00
parent 7b462fc6c4
commit 3078db3222
2 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,5 +1,10 @@
2002-10-03 Stefan Monnier <monnier@cs.yale.edu>
* textmodes/fill.el (fill-paragraph): Give up if there's no
paragraph at or after point.
* textmodes/paragraphs.el (forward-paragraph): Return the steps left.
* vc.el (vc-print-log): Unconditionally use `show-log-entry'.
(vc-default-show-log-entry): New fun.

26
lisp/textmodes/fill.el
View file

@ -697,18 +697,20 @@ If `fill-paragraph-function' is nil, return the `fill-prefix' used for filling."
;; Fill prefix used for filling the paragraph.
fill-pfx)
(save-excursion
(forward-paragraph)
(or (bolp) (newline 1))
(let ((end (point))
(beg (progn (backward-paragraph) (point))))
(goto-char before)
(setq fill-pfx
(if use-hard-newlines
;; Can't use fill-region-as-paragraph, since this
;; paragraph may still contain hard newlines. See
;; fill-region.
(fill-region beg end arg)
(fill-region-as-paragraph beg end arg)))))
(if (not (zerop (forward-paragraph)))
;; There's no paragraph at or after point: give up.
(setq fill-pfx "")
(or (bolp) (newline 1))
(let ((end (point))
(beg (progn (backward-paragraph) (point))))
(goto-char before)
(setq fill-pfx
(if use-hard-newlines
;; Can't use fill-region-as-paragraph, since this
;; paragraph may still contain hard newlines. See
;; fill-region.
(fill-region beg end arg)
(fill-region-as-paragraph beg end arg))))))
;; See if point ended up inside the fill-prefix, and if so, move
;; past it.
(skip-line-prefix fill-pfx)