From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 22 Jul 2003 19:07:49 +0000 (+0000)
Subject: (Finsert_file_contents): Use delete_all_overlays.
X-Git-Tag: ttn-vms-21-2-B4~9255
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=29ea8ae9da63fd9938544cc278ba69a9cfbf0653;p=emacs.git

(Finsert_file_contents): Use delete_all_overlays.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index e9ddaf38aa8..fee3907d110 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2003-07-22  Stefan Monnier  <monnier@cs.yale.edu>
+
+	* xfns.c: Don't check HAVE_PNG_H: autoconf doesn't seem to find it.
+
+	* buffer.c (delete_all_overlays): New function.
+	* buffer.h (delete_all_overlays): Declare.
+	* coding.c (run_pre_post_conversion_on_str):
+	* print.c (temp_output_buffer_setup):
+	* fileio.c (Finsert_file_contents):
+	* minibuf.c (get_minibuffer): Use it.
+
 2003-07-22  Andrew Choi  <akochoi@shaw.ca>
 
 	* unexmacosx.c (unexec_regions_sort_compare):
@@ -18,7 +29,7 @@
 
 	* s/openbsd.h (LD_SWITCH_SYSTEM_TEMACS): Add undef.
 
-	* fns.c (Flocale_info): Renamed from Flanginfo.  Doc fixes.
+	* fns.c (Flocale_info): Rename from Flanginfo.  Doc fixes.
 	(syms_of_fns): Corresponding change.
 
 	* alloc.c (syms_of_alloc): Doc fixes.
diff --git a/src/fileio.c b/src/fileio.c
index d7766fa9f1f..a44552010c7 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3840,12 +3840,13 @@ actually used.  */)
 		  buffer = Fget_buffer_create (build_string (" *code-converting-work*"));
 		  buf = XBUFFER (buffer);
 
+		  delete_all_overlays (buf);
 		  buf->directory = current_buffer->directory;
 		  buf->read_only = Qnil;
 		  buf->filename = Qnil;
 		  buf->undo_list = Qt;
-		  buf->overlays_before = NULL;
-		  buf->overlays_after = NULL;
+		  eassert (buf->overlays_before == NULL);
+		  eassert (buf->overlays_after == NULL);
 
 		  set_buffer_internal (buf);
 		  Ferase_buffer ();