[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/fringe.c [lexbind]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/src/fringe.c [lexbind] |
Date: |
Wed, 08 Dec 2004 19:35:26 -0500 |
Index: emacs/src/fringe.c
diff -c emacs/src/fringe.c:1.2.2.7 emacs/src/fringe.c:1.2.2.8
*** emacs/src/fringe.c:1.2.2.7 Fri Nov 12 04:21:14 2004
--- emacs/src/fringe.c Wed Dec 8 23:31:37 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;
}