diff options
author | Glenn Morris <rgm@gnu.org> | 2020-04-20 07:50:19 -0700 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2020-04-20 07:50:19 -0700 |
commit | 477b9eaf45da1ebc4f2117d69df3571f0bf61e47 (patch) | |
tree | 4600314923713c339c41cd450f50e64c3f16a8aa /src/regex-emacs.c | |
parent | 80f04b5d7c817977a365a999693443c4e04e5223 (diff) | |
parent | 05089a4d65831c5e873956f5f2d92a3d5672d405 (diff) | |
download | emacs-477b9eaf45da1ebc4f2117d69df3571f0bf61e47.tar.gz emacs-477b9eaf45da1ebc4f2117d69df3571f0bf61e47.tar.bz2 emacs-477b9eaf45da1ebc4f2117d69df3571f0bf61e47.zip |
Merge from origin/emacs-27
05089a4d65 (origin/emacs-27) Tweak wording re constant variables
a1040861f1 Tweak setcar-related wording
751510f865 * lisp/image-mode.el: Add prefix key 's' and reduce depend...
9261a219ec * doc/emacs/windows.texi (Window Convenience): Decribe mor...
e1d42da0d6 Fix mutability glitches reported by Drew Adams
5805df74f5 Improve mutability doc
dca35b31d0 Improve mutability documentation
81e7d7f111 Document that quoting yields constants
5734339f40 * doc/lispref/keymaps.texi (Extended Menu Items, Easy Menu...
14a570afae Remove #' and function quoting from lambda forms in manual
d5ec18c66b * src/regex-emacs.c (re_match_2_internal): Rework comment ...
4df8a61117 Add new node "Image Mode" to Emacs Manual.
d7d5ee6c57 ; Fix a typo in cmdargs.texi (bug#40701)
5e9db48fbe * doc/lispref/display.texi (Customizing Bitmaps): Fix typo.
eebfb72c90 Document constant vs mutable objects better
6c187ed6b0 Improve documentation of 'sort-lines'
52288f4b66 Mention 'spam-stat-process-directory-age' in the documenta...
067b070598 ; Fix some typos and doc issues (bug#40695)
# Conflicts:
# etc/NEWS
Diffstat (limited to 'src/regex-emacs.c')
-rw-r--r-- | src/regex-emacs.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/regex-emacs.c b/src/regex-emacs.c index 9cade11c9fb..ba7f3cef64b 100644 --- a/src/regex-emacs.c +++ b/src/regex-emacs.c @@ -3954,9 +3954,11 @@ re_match_2_internal (struct re_pattern_buffer *bufp, /* Prevent shrinking and relocation of buffer text if GC happens while we are inside this function. The calls to - UPDATE_SYNTAX_TABLE_* macros can trigger GC if they call Lisp, - and we have C pointers to buffer text that must not become - invalid as result of GC. */ + UPDATE_SYNTAX_TABLE_* macros can call Lisp (via + `internal--syntax-propertize`); these calls are careful to defend against + buffer modifications, but even with no modifications, the buffer text may + be relocated during GC by `compact_buffer` which would invalidate + our C pointers to buffer text. */ if (!current_buffer->text->inhibit_shrinking) { record_unwind_protect_ptr (unwind_re_match, current_buffer); |