Merge from mainline.

1 files changed, 2 insertions, 1 deletions

diff --git a/src/fileio.c b/src/fileio.c
index a19fcd9f663..c47b3533145 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3860,7 +3860,8 @@ by calling `format-decode', which see.  */)
       if (same_at_start - BEGV_BYTE == end_offset - beg_offset)
         {
           emacs_close (fd);
-          specpdl_ptr--;
+          clear_unwind_protect (fd_index);
+
           /* Truncate the buffer to the size of the file.  */
           del_range_1 (same_at_start, same_at_end, 0, 0);
           goto handled;