Merged from miles@gnu.org--gnu-2005 (patch 169-173, 671-676)

Patches applied:

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

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

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

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

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

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

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

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

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

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

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

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

1 files changed, 6 insertions, 5 deletions

diff --git a/src/alloc.c b/src/alloc.c
index 5ab28bc0cde..5d8ccdc7b7c 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -4500,7 +4500,8 @@ mark_stack ()
 /* Return 1 if OBJ is a valid lisp object.
    Return 0 if OBJ is NOT a valid lisp object.
    Return -1 if we cannot validate OBJ.
-*/
+   This function can be quite slow,
+   so it should only be used in code for manual debugging.  */
 
 int
 valid_lisp_object_p (obj)
@@ -4526,11 +4527,11 @@ valid_lisp_object_p (obj)
      trying), so we trick the o/s to tell us whether p is a valid
      pointer.  Unfortunately, we cannot use NULL_DEVICE here, as
      emacs_write may not validate p in that case.  */
-  if ((fd = emacs_open("__Valid__Lisp__Object__", O_CREAT | O_WRONLY | O_TRUNC, 0666)) >= 0)
+  if ((fd = emacs_open ("__Valid__Lisp__Object__", O_CREAT | O_WRONLY | O_TRUNC, 0666)) >= 0)
     {
-      int valid = emacs_write(fd, (char *)p, 16) == 16;
-      emacs_close(fd);
-      unlink("__Valid__Lisp__Object__");
+      int valid = (emacs_write (fd, (char *)p, 16) == 16);
+      emacs_close (fd);
+      unlink ("__Valid__Lisp__Object__");
       return valid;
     }