Merge from origin/emacs-25

[gnu-emacs] / src / buffer.c

diff --git a/src/buffer.c b/src/buffer.c
index f06d7e08e49c7536b910257d875a3da7109851f0..62b0bc8c6f4e154abd48aa748791fb9302f6ee43 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -2001,7 +2001,7 @@ the current buffer's major mode.  */)
   /* To select a nonfundamental mode,
      select the buffer temporarily and then call the mode function.  */
 
-  record_unwind_protect (save_excursion_restore, save_excursion_save ());
+  record_unwind_current_buffer ();
 
   Fset_buffer (buffer);
   call0 (function);
@@ -5277,7 +5277,7 @@ init_buffer (int initialized)
   if (NILP (BVAR (&buffer_defaults, enable_multibyte_characters)))
     Fset_buffer_multibyte (Qnil);
 
-  pwd = get_current_dir_name ();
+  pwd = emacs_get_current_dir_name ();
 
   if (!pwd)
     {