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

* lisp/textmodes/paragraphs.el (repunctuate-sentences): Use filter variable.

Browse source 
(repunctuate-sentences-filter)<defun>:
Reimplement without using match data.
(repunctuate-sentences-filter)<defvar>: New variable.
(repunctuate-sentences): Use new variable.
Remove regexp group from spaces as was before.
https://lists.gnu.org/archive/html/emacs-devel/2022-01/msg00395.html
This commit is contained in:
Juri Linkov 2022-01-05 20:47:20 +02:00
parent 0a51652f6d
commit 2b59a42583
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lisp/textmodes/paragraphs.el
View file

@ -481,23 +481,27 @@ sentences. Also, every paragraph boundary terminates sentences as well."
(defun repunctuate-sentences-filter (_start _end)
"Search filter used by `repunctuate-sentences' to skip unneeded spaces.
By default, it skips occurrences that already have two spaces.
It is advised to put `advice-add' on this function to add more filters,
By default, it skips occurrences that already have two spaces."
(/= 2 (- (point) (save-excursion (skip-chars-backward " ") (point)))))
(defvar repunctuate-sentences-filter #'repunctuate-sentences-filter
"The default filter used by `repunctuate-sentences'.
It is advised to use `add-function' on this to add more filters,
for example, `(looking-back (rx (or \"e.g.\" \"i.e.\") \" \") 5)'
with a set of predefined abbreviations to skip from adding two spaces."
(not (length= (match-string 4) 2)))
with a set of predefined abbreviations to skip from adding two spaces.")
(defun repunctuate-sentences (&optional no-query start end)
"Put two spaces at the end of sentences from point to the end of buffer.
It works using `query-replace-regexp'. In Transient Mark mode,
if the mark is active, operate on the contents of the region.
Second and third arg START and END specify the region to operate on.
If optional argument NO-QUERY is non-nil, make changes without
asking for confirmation."
If optional argument NO-QUERY is non-nil, make changes without asking
for confirmation. You can use `repunctuate-sentences-filter' to add
filters to skip occurrences of spaces that don't need to be replaced."
(interactive (list nil
(if (use-region-p) (region-beginning))
(if (use-region-p) (region-end))))
(let ((regexp "\\([]\"')]?\\)\\([.?!]\\)\\([]\"')]?\\)\\( +\\)")
(let ((regexp "\\([]\"')]?\\)\\([.?!]\\)\\([]\"')]?\\) +")
(to-string "\\1\\2\\3 "))
(if no-query
(progn
@ -507,10 +511,10 @@ asking for confirmation."
(unwind-protect
(progn
(add-function :after-while isearch-filter-predicate
#'repunctuate-sentences-filter)
repunctuate-sentences-filter)
(query-replace-regexp regexp to-string nil start end))
(remove-function isearch-filter-predicate
#'repunctuate-sentences-filter)))))
repunctuate-sentences-filter)))))
(defun backward-sentence (&optional arg)