Skip to content

Re #135, #124: enforce word boundaries around keywords #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
tlotze wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Re #135, #124: enforce word boundaries around keywords #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0beef4
Fix: #135 enforce word boundary after keyword + suffix
tlotze Sep 3, 2022
943d0f7
Fix: enforce word boundary instead of whitespace before keywords (#124)
tlotze Sep 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions README.org
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,11 @@ Helm and Ivy are also supported. Note that the =helm= and =ivy= packages are no
*Added*
+ Option =magit-todos-submodule-list= controls whether to-dos in submodules are displayed (default: off). (Thanks to [[https://github.com/matsievskiysv][Matsievskiy S.V.]])

*Fixed*

+ Enforce word boundary after keyword + suffix. (#135)
+ Enforce word boundary instead of whitespace before keywords. (#124)

*Changed*
+ Option =magit-todos-exclude-globs= now excludes the `.git/` directory by default. (Thanks to [[https://github.com/Amorymeltzer][Amorymeltzer]].)
+ Library ~org~ is no longer loaded automatically, but only when needed. (This can reduce load time, especially if the user's Org configuration is complex.) ([[https://github.com/alphapapa/magit-todos/issues/120][#120]]. Thanks to [[https://github.com/meedstrom][Martin Edström]] and [[https://github.com/jsigman][Johnny Sigman]] for suggesting.)
Expand Down
5 changes: 2 additions & 3 deletions magit-todos.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1193,11 +1193,10 @@ When SYNC is non-nil, match items are returned."
(1+ space)
(group (1+ not-newline)))
;; Non-Org
(seq (or bol (1+ blank))
(seq (or (seq word word-boundary) (not word) line-start)
(group (or ,@keywords))
(regexp ,magit-todos-keyword-suffix)
(optional (1+ blank)
(group (1+ not-newline)))))))
(or (seq word-boundary word) (not word) line-end)))))
(search-regexp-pcre (rxt-elisp-to-pcre search-regexp-elisp))
(results-regexp (or ,results-regexp
(rx-to-string
Expand Down