(save-match-data): Add comment about using evaporate arg

to set-match-data.

diff --git a/lisp/subr.el b/lisp/subr.el
index 15c23ebc81bedefeb85571c134436de9039e5706..cb8006c10a723c1bbbd5758561a6b3dda7058d68 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2020,6 +2020,8 @@ The value returned is the value of the last form in BODY."
        '((save-match-data-internal (match-data)))
        (list 'unwind-protect
              (cons 'progn body)
+             ;; It is safe to free (evaporate) markers immediately here,
+             ;; as Lisp programs should not copy from save-match-data-internal.
              '(set-match-data save-match-data-internal 'evaporate))))
 
 (defun match-string (num &optional string)

diff --git a/src/ChangeLog b/src/ChangeLog
index 659f1066efc1ee5cc8d273f7e285f1838fa92b56..72890cbc545a48fafc997b0c93448a9c0d36153b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2005-06-23  Kim F. Storm  <storm@cua.dk>
+
+       * search.c (Fmatch_data): Remove evaporate option.
+       (Fmatch_data): Do not mention evaporate option in doc string.
+       Add commentary explaining evaporate arg (for internal use only).
+       (unwind_set_match_data): Add comment on evaporate use.
+
 2005-06-22  Miles Bader  <miles@gnu.org>
 
        * xfaces.c (Qvertical_border): Renamed from `Qvertical_divider'.