diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-11-04 15:01:17 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-11-04 15:01:17 -0700 |
| commit | 6a20bd3579ef87103d5ea37e6b8193dc6385e547 (patch) | |
| tree | e11a49c3cbb7e72ccfb6689fbad81bcccfd12665 /src/regex.h | |
| parent | 29559361f56c9398dcb69db7396dcfc0887843a2 (diff) | |
| parent | dbb341022870ecad4c9177485a6770a355633cc0 (diff) | |
| download | emacs-6a20bd3579ef87103d5ea37e6b8193dc6385e547.tar.gz emacs-6a20bd3579ef87103d5ea37e6b8193dc6385e547.tar.bz2 emacs-6a20bd3579ef87103d5ea37e6b8193dc6385e547.zip | |
Merge from origin/emacs-25
dbb3410 python.el: Fix detection of native completion in Python 3 (bu...
91c97b6 * Makefile.in (install-arch-indep): Skip etc/refcards/emacsve...
9c1cb8d * lisp/subr.el (set-transient-map): Exit for unbound events (...
9c247d2 Update category-table for Chinese characters
43986d1 Inhibit buffer relocation during regex searches
fee4cef Revert fixes to allocation of regex matching
Diffstat (limited to 'src/regex.h')
| -rw-r--r-- | src/regex.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/regex.h b/src/regex.h index cb0796fe9cb..4922440e472 100644 --- a/src/regex.h +++ b/src/regex.h @@ -176,9 +176,7 @@ extern reg_syntax_t re_syntax_options; #ifdef emacs # include "lisp.h" /* In Emacs, this is the string or buffer in which we are matching. - It is used for looking up syntax properties, and also to recompute - pointers in case the object is relocated as a side effect of - calling malloc (if it calls r_alloc_sbrk in ralloc.c). + It is used for looking up syntax properties. If the value is a Lisp string object, we are matching text in that string; if it's nil, we are matching text in the current buffer; if |