Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk

1 files changed, 3 insertions, 3 deletions

diff --git a/src/buffer.c b/src/buffer.c
index 565577e75ae..02ca23eb2dd 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1449,9 +1449,9 @@ state of the current buffer.  Use with care.  */)
         {
           bool already = SAVE_MODIFF < MODIFF;
           if (!already && !NILP (flag))
-            lock_file (fn);
+            Flock_file (fn);
           else if (already && NILP (flag))
-            unlock_file (fn);
+            Funlock_file (fn);
         }
     }
 
@@ -1757,7 +1757,7 @@ cleaning up all windows currently displaying the buffer to be killed. */)
   if (thread_check_current_buffer (b))
     return Qnil;
 
-  /* Run hooks with the buffer to be killed the current buffer.  */
+  /* Run hooks with the buffer to be killed as the current buffer.  */
   {
     ptrdiff_t count = SPECPDL_INDEX ();