Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-18

Merge from emacs--cvs-trunk--0

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0  (patch 125-128)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/gnus--rel--5.10  (patch 28-30)

   - Update from CVS

2 files changed, 8 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d70ccc3d42d..bcde95958dd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-23  Lute Kamstra  <lute@gnu.org>
+
+        * buffer.c (Foverlay_buffer): Doc fix.
+
 2005-02-22  Kim F. Storm  <storm@cua.dk>
 
         * minibuf.c (Ftry_completion, Fall_completions): Allow both string
diff --git a/src/buffer.c b/src/buffer.c
index 153b0ca0bb2..be4f4dcae69 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.
 
@@ -3846,7 +3846,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;
 {