# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1058900625 0
# Node ID 292d2d0762b8e616f82dd45c6162e85b1cecca3c
# Parent  26ceb23fbe4213d813a4aa571a32ec7988fa762a
(get_minibuffer): Use it.

diff -r 26ceb23fbe42 -r 292d2d0762b8 src/minibuf.c
--- a/src/minibuf.c	Tue Jul 22 19:02:58 2003 +0000
+++ b/src/minibuf.c	Tue Jul 22 19:03:45 2003 +0000
@@ -1,6 +1,6 @@
 /* Minibuffer input and completion.
-   Copyright (C) 1985, 1986, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-   2000, 2001, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1985,86,93,94,95,96,97,98,99,2000,01,03
+             Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -777,27 +777,12 @@
   else
     {
       int count = SPECPDL_INDEX ();
-      Lisp_Object overlay;
-      struct buffer *b = XBUFFER (buf);
-
       /* `reset_buffer' blindly sets the list of overlays to NULL, so we
 	 have to empty the list, otherwise we end up with overlays that
 	 think they belong to this buffer while the buffer doesn't know about
 	 them any more.  */
-      while (b->overlays_before)
-	{
-	  XSETMISC (overlay, b->overlays_before);
-	  Fdelete_overlay (overlay);
-	}
-      while (b->overlays_after)
-	{
-	  XSETMISC (overlay, b->overlays_after);
-	  Fdelete_overlay (overlay);
-	}
-      eassert (b->overlays_before == NULL);
-      eassert (b->overlays_after == NULL);
-
-      reset_buffer (b);
+      delete_all_overlays (XBUFFER (buf));
+      reset_buffer (XBUFFER (buf));
       record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
       Fset_buffer (buf);
       Fkill_all_local_variables ();