Index: emacs/src/process.c
diff -c emacs/src/process.c:1.456 emacs/src/process.c:1.457
*** emacs/src/process.c:1.456 Wed Jun 8 15:18:10 2005
--- emacs/src/process.c Wed Jun 8 22:33:36 2005
***************
*** 4887,4896 ****
{
Lisp_Object tem;
/* Don't clobber the CURRENT match data, either! */
! tem = Fmatch_data (Qnil, Qnil);
! restore_match_data ();
! record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil));
! Fset_match_data (tem);
}
/* For speed, if a search happens within this code,
--- 4887,4896 ----
{
Lisp_Object tem;
/* Don't clobber the CURRENT match data, either! */
! tem = Fmatch_data (Qnil, Qnil, Qnil);
! restore_search_regs ();
! record_unwind_save_match_data ();
! Fset_match_data (tem, Qt);
}
/* For speed, if a search happens within this code,
***************
*** 4944,4950 ****
read_process_output_error_handler);
/* If we saved the match data nonrecursively, restore it now. */
! restore_match_data ();
running_asynch_code = outer_running_asynch_code;
/* Handling the process output should not deactivate the mark. */
--- 4944,4950 ----
read_process_output_error_handler);
/* If we saved the match data nonrecursively, restore it now. */
! restore_search_regs ();
running_asynch_code = outer_running_asynch_code;
/* Handling the process output should not deactivate the mark. */
***************
*** 6348,6357 ****
if (outer_running_asynch_code)
{
Lisp_Object tem;
! tem = Fmatch_data (Qnil, Qnil);
! restore_match_data ();
! record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil));
! Fset_match_data (tem);
}
/* For speed, if a search happens within this code,
--- 6348,6357 ----
if (outer_running_asynch_code)
{
Lisp_Object tem;
! tem = Fmatch_data (Qnil, Qnil, Qnil);
! restore_search_regs ();
! record_unwind_save_match_data ();
! Fset_match_data (tem, Qt);
}
/* For speed, if a search happens within this code,
***************
*** 6365,6371 ****
exec_sentinel_error_handler);
/* If we saved the match data nonrecursively, restore it now. */
! restore_match_data ();
running_asynch_code = outer_running_asynch_code;
Vdeactivate_mark = odeactivate;
--- 6365,6371 ----
exec_sentinel_error_handler);
/* If we saved the match data nonrecursively, restore it now. */
! restore_search_regs ();
running_asynch_code = outer_running_asynch_code;
Vdeactivate_mark = odeactivate;
_______________________________________________
Emacs-diffs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/emacs-diffs
