Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.1021 emacs/src/xdisp.c:1.1022
*** emacs/src/xdisp.c:1.1021 Wed Jun 8 15:25:52 2005
--- emacs/src/xdisp.c Wed Jun 8 22:33:35 2005
***************
*** 8489,8495 ****
Lisp_Object tail, frame;
int count = SPECPDL_INDEX ();
! record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil));
FOR_EACH_FRAME (tail, frame)
{
--- 8489,8495 ----
Lisp_Object tail, frame;
int count = SPECPDL_INDEX ();
! record_unwind_save_match_data ();
FOR_EACH_FRAME (tail, frame)
{
***************
*** 8612,8618 ****
set_buffer_internal_1 (XBUFFER (w->buffer));
if (save_match_data)
! record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil));
if (NILP (Voverriding_local_map_menu_flag))
{
specbind (Qoverriding_terminal_local_map, Qnil);
--- 8612,8618 ----
set_buffer_internal_1 (XBUFFER (w->buffer));
if (save_match_data)
! record_unwind_save_match_data ();
if (NILP (Voverriding_local_map_menu_flag))
{
specbind (Qoverriding_terminal_local_map, Qnil);
***************
*** 8803,8809 ****
/* Save match data, if we must. */
if (save_match_data)
! record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil));
/* Make sure that we don't accidentally use bogus keymaps. */
if (NILP (Voverriding_local_map_menu_flag))
--- 8803,8809 ----
/* Save match data, if we must. */
if (save_match_data)
! record_unwind_save_match_data ();
/* Make sure that we don't accidentally use bogus keymaps. */
if (NILP (Voverriding_local_map_menu_flag))
_______________________________________________
Emacs-diffs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/emacs-diffs