1 files changed, 24 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 28824b94e36..077b0da84b3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,26 @@
+2005-06-09  Kim F. Storm  <storm@cua.dk>
+
+        * search.c (Fmatch_data): Add optional RESEAT arg.  Unchain markers
+        in REUSE list if non-nil; free them if equal to evaporate.
+        (Fset_match_data): Add optional RESEAT arg.  Unchain markers in LIST
+        if non-nil; free them if equal to evaporate.  Use XCAR/XCDR.
+        (restore_search_regs): Rename from restore_match_data.  Uses changed.
+        (unwind_set_match_data): New function.
+        (record_unwind_save_match_data): New function like save-match-data.
+
+        * lisp.h (Fmatch_data, Fset_match_data): Fix EXFUN.
+        (record_unwind_save_match_data): Add prototype.
+        (restore_search_regs): Rename from restore_match_data.
+
+        * composite.c (compose_chars_in_text):
+        * eval.c (do_autoload):
+        * macmenu.c (set_frame_menubar):
+        * process.c (read_process_output, exec_sentinel):
+        * xmenu.c (set_frame_menubar):
+        * xdisp.c (prepare_menu_bars, update_menu_bar, update_tool_bar):
+        * w32menu.c (set_frame_menubar):
+        Use record_unwind_save_match_data.
+
 2005-06-08  Richard M. Stallman  <rms@gnu.org>
 
         * xdisp.c (get_next_display_element): Alter previous change:
@@ -14,7 +37,7 @@
 
         * xdisp.c (note_mode_line_or_margin_highlight): Check
         the overlapping of re-rendering area to avoid flickering.
-        (note_mouse_highlight): Call clear_mouse_face if PART 
+        (note_mouse_highlight): Call clear_mouse_face if PART
         is not ON_MODE_LINE nor ON_HEADER_LINE.
 
 2005-06-07  Kim F. Storm  <storm@cua.dk>