[Emacs-diffs] Changes to emacs/src/fringe.c [emacs-unicode-2]

[Miles Bader]

Index: emacs/src/fringe.c
diff -c emacs/src/fringe.c:1.10.2.5 emacs/src/fringe.c:1.10.2.6
*** emacs/src/fringe.c:1.10.2.5 Fri Nov 12 02:52:55 2004
--- emacs/src/fringe.c  Fri Nov 19 06:54:57 2004
***************
*** 1204,1210 ****
    (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;
--- 1204,1209 ----
***************
*** 1212,1231 ****
  
    CHECK_SYMBOL (bitmap);
  
!   if (!STRINGP (bits) && !VECTORP (bits))
!     bits = wrong_type_argument (Qstringp, bits);
! 
!   len = Flength (bits);
  
    if (NILP (height))
!     h = fb.height = XINT (len);
    else
      {
        CHECK_NUMBER (height);
        fb.height = min (XINT (height), 255);
!       if (fb.height > XINT (len))
        {
-         h = XINT (len);
          fill1 = (fb.height - h) / 2;
          fill2 = fb.height - h - fill1;
        }
--- 1211,1231 ----
  
    CHECK_SYMBOL (bitmap);
  
!   if (STRINGP (bits))
!     h = SCHARS (bits);
!   else if (VECTORP (bits))
!     h = XVECTOR (bits)->size;
!   else
!     bits = wrong_type_argument (Qsequencep, bits);
  
    if (NILP (height))
!     fb.height = h;
    else
      {
        CHECK_NUMBER (height);
        fb.height = min (XINT (height), 255);
!       if (fb.height > h)
        {
          fill1 = (fb.height - h) / 2;
          fill2 = fb.height - h - fill1;
        }