aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2007-12-01 06:59:12 +0000
committerRichard M. Stallman2007-12-01 06:59:12 +0000
commit39d0bf746693ddc92c3102f6602dfe8a9cc6db9d (patch)
tree5bd6c14a16119403d833c897c136180566dd6afe
parentc2fd78e06d28b479daf4df2a294f8bdec7d561d3 (diff)
downloademacs-39d0bf746693ddc92c3102f6602dfe8a9cc6db9d.tar.gz
emacs-39d0bf746693ddc92c3102f6602dfe8a9cc6db9d.zip
(syms_of_search) <inhibit-changing-match-data>: Doc fix.
-rw-r--r--etc/NEWS3
-rw-r--r--src/ChangeLog4
-rw-r--r--src/search.c7
3 files changed, 11 insertions, 3 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 609695773e3..2e8c4b0ebf2 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -395,6 +395,9 @@ because they clash with commands provided by dirtrack.el. Use
395** `beginning-of-defun-function' now takes one argument, the count 395** `beginning-of-defun-function' now takes one argument, the count
396 given to `beginning-of-defun'. 396 given to `beginning-of-defun'.
397 397
398** The variable `inhibit-changing-match-data', if non-nil, prevents the
399search and match primitives from changing the match data.
400
398+++ 401+++
399** New function `match-substitute-replacement' returns the result of 402** New function `match-substitute-replacement' returns the result of
400`replace-match' without actually using it in the buffer. 403`replace-match' without actually using it in the buffer.
diff --git a/src/ChangeLog b/src/ChangeLog
index 0c9f035e30a..7a5d7fcf93f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12007-12-01 Richard Stallman <rms@gnu.org>
2
3 * search.c (syms_of_search) <inhibit-changing-match-data>: Doc fix.
4
12007-11-30 Jason Rumney <jasonr@gnu.org> 52007-11-30 Jason Rumney <jasonr@gnu.org>
2 6
3 * w32console.c (w32con_ins_del_lines, scroll_line): Clip to window. 7 * w32console.c (w32con_ins_del_lines, scroll_line): Clip to window.
diff --git a/src/search.c b/src/search.c
index 29def81c3eb..3c91d3cce92 100644
--- a/src/search.c
+++ b/src/search.c
@@ -3239,9 +3239,10 @@ A value of nil (which is the normal value) means treat spaces literally. */);
3239 3239
3240 DEFVAR_LISP ("inhibit-changing-match-data", &Vinhibit_changing_match_data, 3240 DEFVAR_LISP ("inhibit-changing-match-data", &Vinhibit_changing_match_data,
3241 doc: /* Internal use only. 3241 doc: /* Internal use only.
3242If non-nil, the match data will not be changed during call to searching or 3242If non-nil, the primitive searching and matching functions
3243matching functions, such as `looking-at', `string-match', `re-search-forward' 3243such as `looking-at', `string-match', `re-search-forward', etc.,
3244etc. */); 3244do not set the match data. The proper way to use this variable
3245is to bind it with `let' around a small expression. */);
3245 Vinhibit_changing_match_data = Qnil; 3246 Vinhibit_changing_match_data = Qnil;
3246 3247
3247 defsubr (&Slooking_at); 3248 defsubr (&Slooking_at);