1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-24 06:20:43 -08:00

Revert 'forward-sentence-default-function' to return point (bug#62027)

* lisp/textmodes/paragraphs.el
(forward-sentence-default-function): Revert to return the
position of point.
(count-sentences): Adapt to this change.
This commit is contained in:
Manuel Giraud 2023-03-07 20:03:53 +01:00 committed by Eli Zaretskii
parent bfe62b1041
commit ed3bab3cc7

View file

@ -477,8 +477,7 @@ sentences. Also, every paragraph boundary terminates sentences as well."
(skip-chars-backward " \t\n")
(goto-char par-end)))
(setq arg (1- arg)))
(let ((npoint (constrain-to-field nil opoint t)))
(not (= npoint opoint)))))
(constrain-to-field nil opoint t)))
(defun count-sentences (start end)
"Count sentences in current buffer from START to END."
@ -488,8 +487,13 @@ sentences. Also, every paragraph boundary terminates sentences as well."
(save-restriction
(narrow-to-region start end)
(goto-char (point-min))
(while (ignore-errors (forward-sentence))
(setq sentences (1+ sentences)))
(let* ((prev (point))
(next (forward-sentence)))
(while (and (not (null next))
(not (= prev next)))
(setq prev next
next (ignore-errors (forward-sentence))
sentences (1+ sentences))))
;; Remove last possibly empty sentence
(when (/= (skip-chars-backward " \t\n") 0)
(setq sentences (1- sentences)))