diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2023-09-09 04:32:45 -0400 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2023-09-09 04:32:45 -0400 |
| commit | 0273914921833d2e2b6548cf69297c24a50cff74 (patch) | |
| tree | 8007efa413cf93f51d1feb797f70256afba513a9 /src/regex-emacs.c | |
| parent | f77ea3b2d75dbb6fd956f00b1c598d2664aa8400 (diff) | |
| parent | bc56da92d8df806ff9ec66be70920d98e0ef5b42 (diff) | |
| download | emacs-0273914921833d2e2b6548cf69297c24a50cff74.tar.gz emacs-0273914921833d2e2b6548cf69297c24a50cff74.tar.bz2 emacs-0273914921833d2e2b6548cf69297c24a50cff74.zip | |
Merge from origin/emacs-29
bc56da92d8d ; Fix error in 'tex-recenter-output-buffer'
d17c5adc057 Fix regexp for recognizing PBM images
9e9f61866e7 Improve wording in ELisp manual
7427efa033b Fix typo (Bug#65764)
59c66244080 ; * lisp/ido.el (ido-completion-buffer): Fix :type (bug#6...
4ec4b18c2a0 Fix libgccjit build on Haiku
80bdcf8f351 (regexp-tests-backtrack-optimization): Mark it as failing
8a9e653cc82 ; Add regression test for bug#65726
6fad73d7cc5 * src/regex-emacs.c (mutually_exclusive_p): Fix inf-loop ...
1d3d4196073 ; * lisp/files.el (save-some-buffers-functions): Doc fix ...
42b14c6e5bb Bump seq version to 2.24
ff5190a174f Add note on ELPA to admin/notes/bug-triage
f1e4cbe72aa ; * etc/PROBLEMS: Minor wording fix.
fd5593c7f25 * etc/PROBLEMS: Mention bug#65432 and its remedy.
dd896ea1e62 Ignore errors when checking for object initializers (bug#...
3550f44c17c ; Fix typos
5b246b9b817 * CONTRIBUTE: Document making ChangeLogs with Magit.
0bd46619413 Doc fixes for obsolete functions and variables
524c0c34f24 ; * lisp/ffap.el (ffap-rfs-regexp): Fix :type (bug#65698).
f48dccc4675 Merge branch 'emacs-29' of git.savannah.gnu.org:/srv/git/...
71a85e22668 A revision to the Widget manual
dbbcf4a6599 Fix fontification of " in edit-kbd-macro
# Conflicts:
# test/src/regex-emacs-tests.el
Diffstat (limited to 'src/regex-emacs.c')
| -rw-r--r-- | src/regex-emacs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/regex-emacs.c b/src/regex-emacs.c index 7e75f0ac597..394ba22e9b0 100644 --- a/src/regex-emacs.c +++ b/src/regex-emacs.c @@ -3832,7 +3832,7 @@ mutually_exclusive_p (struct re_pattern_buffer *bufp, re_char *p1, EXTRACT_NUMBER_AND_INCR (mcnt, p2); /* Don't just test `mcnt > 0` because non-greedy loops have their test at the end with an unconditional jump at the start. */ - if (p2 + mcnt > p2_orig) /* Ensure forward progress. */ + if (p2 > p2_orig && mcnt >= 0) /* Ensure forward progress. */ return (mutually_exclusive_p (bufp, p1, p2) && mutually_exclusive_p (bufp, p1, p2 + mcnt)); break; |