summaryrefslogtreecommitdiff
path: root/lisp/subr.el
diff options
context:
space:
mode:
authorKaroly Lorentey <lorentey@elte.hu>2005-06-25 15:00:08 +0000
committerKaroly Lorentey <lorentey@elte.hu>2005-06-25 15:00:08 +0000
commit0d0358be7e741898e363d02dbff01b35c662413c (patch)
treee6bdb6ae792a8be712780a5cfad4eeddb09c4f43 /lisp/subr.el
parentf4d9bf3a9be50a17c2e2f7569b88f3606ab273d9 (diff)
parentb93e3c3ba1644f5e746c7486bd609ba9fc7ec583 (diff)
downloademacs-0d0358be7e741898e363d02dbff01b35c662413c.tar.gz
Merged from miles@gnu.org--gnu-2005 (patch 441-446)
Patches applied: * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-441 Update reference to renamed Buffer-menu-buffer face * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-442 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-443 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-444 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-445 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-446 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-354
Diffstat (limited to 'lisp/subr.el')
-rw-r--r--lisp/subr.el2
1 files changed, 2 insertions, 0 deletions
diff --git a/lisp/subr.el b/lisp/subr.el
index f43f84fd7d7..113ba4239e0 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2032,6 +2032,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)