Merged in changes from CVS trunk.

Patches applied:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-709
   Update from CVS: src/indent.c (Fvertical_motion): Fix last change.

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

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

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

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

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-72
   Update from CVS

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


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

1 files changed, 8 insertions, 8 deletions

diff --git a/src/fringe.c b/src/fringe.c
index 03abffab5c8..661af1fb0eb 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -1210,7 +1210,6 @@ If BITMAP already exists, the existing definition is replaced.  */)
   (bitmap, bits, height, width, align)
      Lisp_Object bitmap, bits, height, width, align;
 {
-  Lisp_Object len;
   int n, h, i, j;
   unsigned short *b;
   struct fringe_bitmap fb, *xfb;
@@ -1218,20 +1217,21 @@ If BITMAP already exists, the existing definition is replaced.  */)
 
   CHECK_SYMBOL (bitmap);
 
-  if (!STRINGP (bits) && !VECTORP (bits))
-    bits = wrong_type_argument (Qstringp, bits);
-
-  len = Flength (bits);
+  if (STRINGP (bits))
+    h = SCHARS (bits);
+  else if (VECTORP (bits))
+    h = XVECTOR (bits)->size;
+  else
+    bits = wrong_type_argument (Qsequencep, bits);
 
   if (NILP (height))
-    h = fb.height = XINT (len);
+    fb.height = h;
   else
     {
       CHECK_NUMBER (height);
       fb.height = min (XINT (height), 255);
-      if (fb.height > XINT (len))
+      if (fb.height > h)
         {
-          h = XINT (len);
           fill1 = (fb.height - h) / 2;
           fill2 = fb.height - h - fill1;
         }