Merged in changes from CVS HEAD

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-161
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-162
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-163
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-164
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-165
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-166
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-167
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-168
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-169
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-170
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-171
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-172
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-122

1 files changed, 1 insertions, 1 deletions

diff --git a/src/buffer.c b/src/buffer.c
index 27b12845c50..08031a0d72b 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -3293,7 +3293,7 @@ adjust_overlays_for_delete (pos, length)
    If so, we'll reverse the endpoints.  Can you think of anything
    better to do in this situation?  */
 void
-fix_overlays_in_range (start, end)
+fix_start_end_in_overlays (start, end)
      register int start, end;
 {
   Lisp_Object overlay;