summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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
** `beginning-of-defun-function' now takes one argument, the count
given to `beginning-of-defun'.
+** The variable `inhibit-changing-match-data', if non-nil, prevents the
+search and match primitives from changing the match data.
+
+++
** New function `match-substitute-replacement' returns the result of
`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 @@
+2007-12-01 Richard Stallman <rms@gnu.org>
+
+ * search.c (syms_of_search) <inhibit-changing-match-data>: Doc fix.
+
2007-11-30 Jason Rumney <jasonr@gnu.org>
* 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. */);
DEFVAR_LISP ("inhibit-changing-match-data", &Vinhibit_changing_match_data,
doc: /* Internal use only.
-If non-nil, the match data will not be changed during call to searching or
-matching functions, such as `looking-at', `string-match', `re-search-forward'
-etc. */);
+If non-nil, the primitive searching and matching functions
+such as `looking-at', `string-match', `re-search-forward', etc.,
+do not set the match data. The proper way to use this variable
+is to bind it with `let' around a small expression. */);
Vinhibit_changing_match_data = Qnil;
defsubr (&Slooking_at);