From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 25 Jul 2013 08:07:47 +0000 (+0100)
Subject: * fileio.c (Finsert_file_contents): Use a more-conservative fix.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1698^2~49
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b68060293249e7a86c23dfb7a831a11dbb5bd694;p=emacs.git

* fileio.c (Finsert_file_contents): Use a more-conservative fix.

Fixes: debbugs:14936
---

diff --git a/src/fileio.c b/src/fileio.c
index 1350e19ef27..c47b3533145 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3860,10 +3860,7 @@ by calling `format-decode', which see.  */)
       if (same_at_start - BEGV_BYTE == end_offset - beg_offset)
 	{
 	  emacs_close (fd);
-
-	  /* Discard the unwind protect for closing the file, and any
-	     unwind protect for restoring point.  */
-	  specpdl_ptr = specpdl + fd_index;
+	  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);