Mercurial > emacs

comparison src/fringe.c @ 83397:693e794b57bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from miles@gnu.org--gnu-2005 (patch 149-151, 629-641) Patches applied: * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-629 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-630 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-631 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-632 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-633 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-634 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-635 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-636 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-637 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-638 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-639 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-640 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-641 Update from CVS * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-149 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-150 Update from CVS * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-151 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-437
author Karoly Lorentey <lorentey@elte.hu>
date Mon, 07 Nov 2005 14:56:19 +0000
parents b31326248cf6 cf3d316b4bc0
children b98066f4aa10
comparison
equal deleted inserted replaced
83396:201f610eb492 83397:693e794b57bf
859 done_top = 1; 859 done_top = 1;
860 } 860 }
861 861
862 if (!done_bot) 862 if (!done_bot)
863 { 863 {
864 if (row->ends_at_zv_p 864 if (MATRIX_ROW_END_CHARPOS (row) >= BUF_ZV (XBUFFER (w->buffer))
865 && !MATRIX_ROW_PARTIALLY_VISIBLE_AT_BOTTOM_P (w, row)) 865 && !MATRIX_ROW_PARTIALLY_VISIBLE_AT_BOTTOM_P (w, row))
866 row->indicate_eob_p = !NILP (boundary_bot), done_bot = 1; 866 row->indicate_eob_p = !NILP (boundary_bot), done_bot = 1;
867 else if (y + row->height >= yb) 867 else if (y + row->height >= yb)
868 row->indicate_bottom_line_p = !NILP (arrow_bot), done_bot = 1; 868 row->indicate_bottom_line_p = !NILP (arrow_bot), done_bot = 1;
869 } 869 }
905 } 905 }
906 else if (row->truncated_on_left_p) 906 else if (row->truncated_on_left_p)
907 left = LEFT_TRUNCATION_BITMAP; 907 left = LEFT_TRUNCATION_BITMAP;
908 else if (row->indicate_bob_p && EQ (boundary_top, Qleft)) 908 else if (row->indicate_bob_p && EQ (boundary_top, Qleft))
909 left = ((row->indicate_eob_p && EQ (boundary_bot, Qleft)) 909 left = ((row->indicate_eob_p && EQ (boundary_bot, Qleft))
910 ? LEFT_BRACKET_BITMAP : TOP_LEFT_ANGLE_BITMAP); 910 ? (row->ends_at_zv_p
911 ? TOP_RIGHT_ANGLE_BITMAP : LEFT_BRACKET_BITMAP)
912 : TOP_LEFT_ANGLE_BITMAP);
911 else if (row->indicate_eob_p && EQ (boundary_bot, Qleft)) 913 else if (row->indicate_eob_p && EQ (boundary_bot, Qleft))
912 left = BOTTOM_LEFT_ANGLE_BITMAP; 914 left = (row->ends_at_zv_p
915 ? TOP_RIGHT_ANGLE_BITMAP : BOTTOM_LEFT_ANGLE_BITMAP);
913 else if (MATRIX_ROW_CONTINUATION_LINE_P (row)) 916 else if (MATRIX_ROW_CONTINUATION_LINE_P (row))
914 left = CONTINUATION_LINE_BITMAP; 917 left = CONTINUATION_LINE_BITMAP;
915 else if (row->indicate_empty_line_p && EQ (empty_pos, Qleft)) 918 else if (row->indicate_empty_line_p && EQ (empty_pos, Qleft))
916 left = ZV_LINE_BITMAP; 919 left = ZV_LINE_BITMAP;
917 else if (row->indicate_top_line_p && EQ (arrow_top, Qleft)) 920 else if (row->indicate_top_line_p && EQ (arrow_top, Qleft))
931 } 934 }
932 else if (row->truncated_on_right_p) 935 else if (row->truncated_on_right_p)
933 right = RIGHT_TRUNCATION_BITMAP; 936 right = RIGHT_TRUNCATION_BITMAP;
934 else if (row->indicate_bob_p && EQ (boundary_top, Qright)) 937 else if (row->indicate_bob_p && EQ (boundary_top, Qright))
935 right = ((row->indicate_eob_p && EQ (boundary_bot, Qright)) 938 right = ((row->indicate_eob_p && EQ (boundary_bot, Qright))
936 ? RIGHT_BRACKET_BITMAP : TOP_RIGHT_ANGLE_BITMAP); 939 ? (row->ends_at_zv_p
940 ? TOP_LEFT_ANGLE_BITMAP : RIGHT_BRACKET_BITMAP)
941 : TOP_RIGHT_ANGLE_BITMAP);
937 else if (row->indicate_eob_p && EQ (boundary_bot, Qright)) 942 else if (row->indicate_eob_p && EQ (boundary_bot, Qright))
938 right = BOTTOM_RIGHT_ANGLE_BITMAP; 943 right = (row->ends_at_zv_p
944 ? TOP_LEFT_ANGLE_BITMAP : BOTTOM_RIGHT_ANGLE_BITMAP);
939 else if (row->continued_p) 945 else if (row->continued_p)
940 right = CONTINUED_LINE_BITMAP; 946 right = CONTINUED_LINE_BITMAP;
941 else if (row->indicate_top_line_p && EQ (arrow_top, Qright)) 947 else if (row->indicate_top_line_p && EQ (arrow_top, Qright))
942 right = UP_ARROW_BITMAP; 948 right = UP_ARROW_BITMAP;
943 else if (row->indicate_bottom_line_p && EQ (arrow_bot, Qright)) 949 else if (row->indicate_bottom_line_p && EQ (arrow_bot, Qright))