Merged from

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-31
   Update from CVS

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

1 files changed, 2 insertions, 1 deletions

diff --git a/src/data.c b/src/data.c
index c70e3219eac..10d6a1e9eb5 100644
--- a/src/data.c
+++ b/src/data.c
@@ -275,7 +275,8 @@ DEFUN ("atom", Fatom, Satom, 1, 1, 0,
 }
 
 DEFUN ("listp", Flistp, Slistp, 1, 1, 0,
-       doc: /* Return t if OBJECT is a list.  This includes nil.  */)
+       doc: /* Return t if OBJECT is a list, that is, a cons cell or nil.
+Otherwise, return nil.  */)
      (object)
      Lisp_Object object;
 {