New function record_unwind_protect_excursion

This simplifies callers a bit, and will simplify future changes.
* src/eval.c (record_unwind_protect_excursion): New function.
* src/buffer.c (Fkill_buffer):
* src/bytecode.c (exec_byte_code):
* src/editfns.c (Fsave_excursion, Freplace_buffer_contents):
* src/lread.c (readevalloop, Feval_buffer):
* src/window.c (scroll_command):
Use it.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/lread.c b/src/lread.c
index 239c66ccb85..d2c7eae20f9 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1976,11 +1976,11 @@ readevalloop (Lisp_Object readcharfun,
       if (!NILP (start))
         {
           /* Switch to the buffer we are reading from.  */
-          record_unwind_protect (save_excursion_restore, save_excursion_save ());
+          record_unwind_protect_excursion ();
           set_buffer_internal (b);
 
           /* Save point in it.  */
-          record_unwind_protect (save_excursion_restore, save_excursion_save ());
+          record_unwind_protect_excursion ();
           /* Save ZV in it.  */
           record_unwind_protect (save_restriction_restore, save_restriction_save ());
           /* Those get unbound after we read one expression.  */
@@ -2137,7 +2137,7 @@ This function preserves the position of point.  */)
 
   specbind (Qeval_buffer_list, Fcons (buf, Veval_buffer_list));
   specbind (Qstandard_output, tem);
-  record_unwind_protect (save_excursion_restore, save_excursion_save ());
+  record_unwind_protect_excursion ();
   BUF_TEMP_SET_PT (XBUFFER (buf), BUF_BEGV (XBUFFER (buf)));
   specbind (Qlexical_binding, lisp_file_lexically_bound_p (buf) ? Qt : Qnil);
   BUF_TEMP_SET_PT (XBUFFER (buf), BUF_BEGV (XBUFFER (buf)));