Mercurial > emacs

comparison src/fringe.c @ 83532:b19aaf4ab0ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from emacs@sv.gnu.org. Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-331 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-332 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-333 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-334 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-335 Add note about "link" button-class to etc/TODO * emacs@sv.gnu.org/emacs--devo--0--patch-336 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-337 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-338 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-339 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-340 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-341 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-342 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-343 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-344 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-345 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-346 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-347 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-348 Update for ERC 5.1.3. * emacs@sv.gnu.org/emacs--devo--0--patch-349 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-350 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/gnus--rel--5.10--patch-111 Update from CVS: texi/gnus.texi (Summary Buffer Lines): Fix typo. * emacs@sv.gnu.org/gnus--rel--5.10--patch-112 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-113 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-114 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-572
author Karoly Lorentey <lorentey@elte.hu>
date Fri, 14 Jul 2006 05:56:32 +0000
parents b901f4f12f33 bf40c8c83e7a
children b8d9a391daf3
comparison
equal deleted inserted replaced
83531:a387c138b28e 83532:b19aaf4ab0ee
1402 1402
1403 1403
1404 DEFUN ("define-fringe-bitmap", Fdefine_fringe_bitmap, Sdefine_fringe_bitmap, 1404 DEFUN ("define-fringe-bitmap", Fdefine_fringe_bitmap, Sdefine_fringe_bitmap,
1405 2, 5, 0, 1405 2, 5, 0,
1406 doc: /* Define fringe bitmap BITMAP from BITS of size HEIGHT x WIDTH. 1406 doc: /* Define fringe bitmap BITMAP from BITS of size HEIGHT x WIDTH.
1407 BITMAP is a symbol or string naming the new fringe bitmap. 1407 BITMAP is a symbol identifying the new fringe bitmap.
1408 BITS is either a string or a vector of integers. 1408 BITS is either a string or a vector of integers.
1409 HEIGHT is height of bitmap. If HEIGHT is nil, use length of BITS. 1409 HEIGHT is height of bitmap. If HEIGHT is nil, use length of BITS.
1410 WIDTH must be an integer between 1 and 16, or nil which defaults to 8. 1410 WIDTH must be an integer between 1 and 16, or nil which defaults to 8.
1411 Optional fifth arg ALIGN may be one of `top', `center', or `bottom', 1411 Optional fifth arg ALIGN may be one of `top', `center', or `bottom',
1412 indicating the positioning of the bitmap relative to the rows where it 1412 indicating the positioning of the bitmap relative to the rows where it
1427 if (STRINGP (bits)) 1427 if (STRINGP (bits))
1428 h = SCHARS (bits); 1428 h = SCHARS (bits);
1429 else if (VECTORP (bits)) 1429 else if (VECTORP (bits))
1430 h = XVECTOR (bits)->size; 1430 h = XVECTOR (bits)->size;
1431 else 1431 else
1432 bits = wrong_type_argument (Qsequencep, bits); 1432 wrong_type_argument (Qsequencep, bits);
1433 1433
1434 if (NILP (height)) 1434 if (NILP (height))
1435 fb.height = h; 1435 fb.height = h;
1436 else 1436 else
1437 { 1437 {