1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-14 23:40:39 -08:00
Commit graph

29 commits

Author SHA1 Message Date
Karoly Lorentey
e417405015 Merged in changes from CVS trunk.
Patches applied:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-267
2004-11-13 18:34:40 +00:00
Kim F. Storm
c3c69bb625 (destroy_fringe_bitmap): Fix return type.
(Ffringe_bitmaps_at_pos): Remove unused var 'old_buffer'.
2004-11-09 13:23:32 +00:00
Kim F. Storm
81544a1d14 (update_window_fringes): Update fringe bitmaps if
cur and row ends_at_zv_p differs.  If bitmaps of a row is updated,
also update previous row to get rid of misc. artifacts.
2004-11-08 23:34:12 +00:00
Karoly Lorentey
d914383aad Merged in changes from CVS trunk.
Patches applied:

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

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

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

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


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-256
2004-10-10 16:41:56 +00:00
Karoly Lorentey
a284b53835 Removed C99ism in init_fringe_bitmap.
* src/fringe.c (init_fringe_bitmap): Removed C99ism.


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-254
2004-10-08 11:15:37 +00:00
Kim F. Storm
11491cbb2a (draw_window_fringes): Return value now indicates if
any fringe bitmaps were redrawn (or there are no fringes).
2004-10-07 21:57:53 +00:00
Karoly Lorentey
c5f80d9d13 Merged in changes from CVS trunk.
Patches applied:

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

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

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

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

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

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

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

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

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

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

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

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

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

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


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-253
2004-10-07 16:52:19 +00:00
Kim F. Storm
d3848fe90d (Ffringe_bitmaps_at_pos): Change return value from cons
to list.  Include overlay arrow bitmap in return value.
2004-10-04 14:13:18 +00:00
Karoly Lorentey
04ccca970d Merged in changes from CVS trunk.
Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-581
   Fix exec-shield autoconf test

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-252
2004-10-03 13:08:55 +00:00
Kim F. Storm
ad67849eb3 Remove limit on number of bitmaps.
(fringe_bitmaps, fringe_faces): Change to pointers.
(max_fringe_bitmaps): New var.
(Fdefine_fringe_bitmap): Expand fringe_bitmaps and fringe_faces.
(init_fringe): Allocate fringe_bitmaps and fringe_faces.
2004-09-29 14:22:25 +00:00
Kim F. Storm
4cce0ab79f Simplify last change.
(lookup_fringe_bitmap): New function.
(valid_fringe_bitmap_p, resolve_fringe_bitmap): Remove.
(Fdestroy_fringe_bitmap): Use lookup_fringe_bitmap.
Keep standard bitmaps in Vfringe_bitmaps.
(Fdefine_fringe_bitmap): Use lookup_fringe_bitmap.
(Fset_fringe_bitmap_face): Likewise.
2004-09-29 11:57:48 +00:00
Kim F. Storm
f2be4fd018 * fringe.c (destroy_fringe_bitmap, init_fringe_bitmap)
(w32_init_fringe, w32_reset_fringes): Fix bootstrap (NULL rif).
2004-09-29 08:51:40 +00:00
Karoly Lorentey
181bb49001 Merged in changes from CVS trunk.
Patches applied:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-251
2004-09-29 08:38:15 +00:00
Kim F. Storm
7a2a85be99 (Vfringe_bitmaps): New variable.
(syms_of_fringe): DEFVAR_LISP it.
(valid_fringe_bitmap_p): Rename from valid_fringe_bitmap_id_p.
Change arg to Lisp_Object and fail if not an integer.
(get_fringe_bitmap_name, resolve_fringe_bitmap)
(destroy_fringe_bitmap): New functions.
(Fdestroy_fringe_bitmap): Change arg to bitmap symbol.  Use
destroy_fringe_bitmap.  Remove symbol from Vfringe_bitmaps and
clear its fringe property.
(init_fringe_bitmap): Use destroy_fringe_bitmap instead of
Fdestroy_fringe_bitmap.
(Fdefine_fringe_bitmap): Add BITMAP arg specifying new or existing
bitmap symbol; remove WHICH arg.  Add symbol to Vfringe_bitmaps
and set fringe property.  Signal error if no free slots.
(Fset_fringe_bitmap_face): Change arg to bitmap symbol.
(Ffringe_bitmaps_at_pos): Return bitmap symbols instead of numbers.
2004-09-28 23:02:53 +00:00
Kim F. Storm
5797a7a0fc (update_window_fringes): Handle new formats of
indicate-buffer-boundaries (symbol or alist).  No longer
allow a simple cons.
(Ffringe_bitmaps_at_pos): Use nil value for no bitmap.
2004-09-27 13:28:23 +00:00
Karoly Lorentey
628ef54496 Trivial cleanup in fringe.c, missing from previous patch.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-121
2004-03-19 23:21:11 +00:00
Karoly Lorentey
54e81dc647 Merged in changes from CVS HEAD
Patches applied:

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

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

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

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

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

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

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

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

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

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

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

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


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-112
2004-03-07 15:30:22 +00:00
Kim F. Storm
1c2a9e9882 (draw_fringe_bitmap): Use w->overlay_arrow_bitmap if set.
(update_window_fringes): Remove unused code.
2004-03-01 23:56:44 +00:00
Juanma Barranquero
bffe8c261b (Fdefine_fringe_bitmap): Fix typo in docstring. 2004-03-01 18:46:48 +00:00
Karoly Lorentey
3b7fbceb83 Merged in changes from CVS HEAD
Patches applied:

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

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

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


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-87
2004-02-20 15:41:31 +00:00
Andreas Schwab
beaedd5620 (Fdefine_fringe_bitmap): Use && instead of & to avoid
warning.
2004-02-19 11:11:39 +00:00
Karoly Lorentey
e581a46687 Merged in changes from CVS HEAD
Patches applied:

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

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

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

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

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

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

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

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

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

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

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

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

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
   Add lisp/emacs-lisp/macroexp.el

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

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

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

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

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

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

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

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

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

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

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

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

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


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-77
2004-02-17 01:52:25 +00:00
Stephen Eglen
159c348e36 (init_fringe_bitmap): Define j in MAC_OS code. 2004-02-16 11:54:29 +00:00
Stefan Monnier
d2f1499943 Lisp_Object/int mixup. 2004-02-16 04:53:28 +00:00
Kim F. Storm
bd23113188 (init_fringe_bitmap) [MAC_OS, WORDS_BIG_ENDIAN]: Perform byte-swapping. 2004-02-15 16:19:00 +00:00
Kim F. Storm
d30b6b3390 (Ffringe_bitmaps_at_pos): Add missing arg declarations. 2004-02-13 23:44:37 +00:00
Kim F. Storm
0881a0fd14 (struct fringe_bitmap): Change member bits from char to
short to facilitate 16 bits wide bitmaps.  Modify all standard
bitmaps accordingly.
(BYTES_PER_BITMAP_ROW, STANDARD_BITMAP_HEIGHT): New macros.
(FRBITS): Use STANDARD_BITMAP_HEIGHT instead of just sizeof.
(draw_fringe_bitmap): Ditto.
(init_fringe_bitmap) [MAC_OS]: Don't bitswap.
(init_fringe_bitmap) [HAVE_X_WINDOWS]: Enhance bitswapping to
handle up to 16 bits wide bitmaps.
(Fdefine_fringe_bitmap): Doc fix.  Handle wider bitmaps.
2004-02-13 23:28:52 +00:00
Miles Bader
429e7e2d69 Resolve CVS conflicts 2004-02-09 12:42:04 +00:00
Kim F. Storm
2d05deefc7 New file. Move original fringe related declarations
and code from dispextern.h and xdisp.c here.
Rework code to support user defined fringe bitmaps, redefining
standard bitmaps, ability to overlay user defined bitmap with
overlay arrow bitmap, and add faces to bitmaps.
(Voverflow_newline_into_fringe): Declare here.
(enum fringe_bitmap_align): New enum.
(..._bits): All bitmaps are now defined without bitswapping; that
is now done in init_fringe_once (if necessary).
(standard_bitmaps): New array with specifications for the
standard fringe bitmaps.
(fringe_faces): New array.
(valid_fringe_bitmap_id_p): New function.
(draw_fringe_bitmap_1): Rename from draw_fringe_bitmap.
(draw_fringe_bitmap): New function which draws fringe bitmap,
possibly overlaying bitmap with cursor in right fringe or the
overlay arrow in the left fringe.
(update_window_fringes): Do not handle overlay arrow here.
Compare and copy fringe bitmap faces.
(init_fringe_bitmap): New function.
(Fdefine_fringe_bitmap, Fdestroy_fringe_bitmap): New DEFUNs to
define and destroy user defined fringe bitmaps.
(Fset_fringe_bitmap_face): New DEFUN to set face for a fringe bitmap.
(Ffringe_bitmaps_at_pos): New DEFUN to read current fringe bitmaps.
(syms_of_fringe): New function.  Defsubr new DEFUNs.
DEFVAR_LISP Voverflow_newline_into_fringe.
(init_fringe_once, init_fringe): New functions.
(w32_init_fringe, w32_reset_fringes) [WINDOWS_NT]: New functions.
2004-02-08 23:18:16 +00:00