Merged from miles@gnu.org--gnu-2005 (patch 27, 120-125)

Patches applied:

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

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

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-124
   Merge from gnus--rel--5.10

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

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-27
   Update from CVS

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

1 files changed, 4 insertions, 3 deletions

diff --git a/src/buffer.c b/src/buffer.c
index ae390ba7500..3394e1dead2 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1,6 +1,6 @@
 /* Buffer manipulation primitives for GNU Emacs.
-   Copyright (C) 1985,86,87,88,89,93,94,95,97,98, 1999, 2000, 2001, 02, 03, 2004
-        Free Software Foundation, Inc.
+   Copyright (C) 1985, 86, 87, 88, 89, 93, 94, 95, 97, 98, 99, 
+     2000, 01, 02, 03, 04, 2005 Free Software Foundation, Inc. 
 
 This file is part of GNU Emacs.
 
@@ -3830,7 +3830,8 @@ DEFUN ("overlay-end", Foverlay_end, Soverlay_end, 1, 1, 0,
 }
 
 DEFUN ("overlay-buffer", Foverlay_buffer, Soverlay_buffer, 1, 1, 0,
-       doc: /* Return the buffer OVERLAY belongs to.  */)
+       doc: /* Return the buffer OVERLAY belongs to.
+Return nil if OVERLAY has been deleted.  */)
      (overlay)
        Lisp_Object overlay;
 {