diff options
| author | Kim F. Storm | 2005-11-01 22:32:24 +0000 |
|---|---|---|
| committer | Kim F. Storm | 2005-11-01 22:32:24 +0000 |
| commit | b15d77dddbb989c0db72a398470954632bd033d0 (patch) | |
| tree | 46b6a0c5689cc6b7a47a0f01c0becb85cc4c1320 | |
| parent | b4235a80c8a7c183320cc06bea271f6599fc9eea (diff) | |
| download | emacs-b15d77dddbb989c0db72a398470954632bd033d0.tar.gz emacs-b15d77dddbb989c0db72a398470954632bd033d0.zip | |
(update_window_fringes): Undo 2005-10-27 change.
Instead, rotate the bottom angle bitmap 180 degrees to indicate
that the bottom row does not end in a newline.
| -rw-r--r-- | src/fringe.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/fringe.c b/src/fringe.c index 5513c3374c3..334cc4515fd 100644 --- a/src/fringe.c +++ b/src/fringe.c | |||
| @@ -860,7 +860,7 @@ update_window_fringes (w, keep_current_p) | |||
| 860 | 860 | ||
| 861 | if (!done_bot) | 861 | if (!done_bot) |
| 862 | { | 862 | { |
| 863 | if (row->ends_at_zv_p | 863 | if (MATRIX_ROW_END_CHARPOS (row) >= BUF_ZV (XBUFFER (w->buffer)) |
| 864 | && !MATRIX_ROW_PARTIALLY_VISIBLE_AT_BOTTOM_P (w, row)) | 864 | && !MATRIX_ROW_PARTIALLY_VISIBLE_AT_BOTTOM_P (w, row)) |
| 865 | row->indicate_eob_p = !NILP (boundary_bot), done_bot = 1; | 865 | row->indicate_eob_p = !NILP (boundary_bot), done_bot = 1; |
| 866 | else if (y + row->height >= yb) | 866 | else if (y + row->height >= yb) |
| @@ -906,9 +906,12 @@ update_window_fringes (w, keep_current_p) | |||
| 906 | left = LEFT_TRUNCATION_BITMAP; | 906 | left = LEFT_TRUNCATION_BITMAP; |
| 907 | else if (row->indicate_bob_p && EQ (boundary_top, Qleft)) | 907 | else if (row->indicate_bob_p && EQ (boundary_top, Qleft)) |
| 908 | left = ((row->indicate_eob_p && EQ (boundary_bot, Qleft)) | 908 | left = ((row->indicate_eob_p && EQ (boundary_bot, Qleft)) |
| 909 | ? LEFT_BRACKET_BITMAP : TOP_LEFT_ANGLE_BITMAP); | 909 | ? (row->ends_at_zv_p |
| 910 | ? TOP_RIGHT_ANGLE_BITMAP : LEFT_BRACKET_BITMAP) | ||
| 911 | : TOP_LEFT_ANGLE_BITMAP); | ||
| 910 | else if (row->indicate_eob_p && EQ (boundary_bot, Qleft)) | 912 | else if (row->indicate_eob_p && EQ (boundary_bot, Qleft)) |
| 911 | left = BOTTOM_LEFT_ANGLE_BITMAP; | 913 | left = (row->ends_at_zv_p |
| 914 | ? TOP_RIGHT_ANGLE_BITMAP : BOTTOM_LEFT_ANGLE_BITMAP); | ||
| 912 | else if (MATRIX_ROW_CONTINUATION_LINE_P (row)) | 915 | else if (MATRIX_ROW_CONTINUATION_LINE_P (row)) |
| 913 | left = CONTINUATION_LINE_BITMAP; | 916 | left = CONTINUATION_LINE_BITMAP; |
| 914 | else if (row->indicate_empty_line_p && EQ (empty_pos, Qleft)) | 917 | else if (row->indicate_empty_line_p && EQ (empty_pos, Qleft)) |
| @@ -932,9 +935,12 @@ update_window_fringes (w, keep_current_p) | |||
| 932 | right = RIGHT_TRUNCATION_BITMAP; | 935 | right = RIGHT_TRUNCATION_BITMAP; |
| 933 | else if (row->indicate_bob_p && EQ (boundary_top, Qright)) | 936 | else if (row->indicate_bob_p && EQ (boundary_top, Qright)) |
| 934 | right = ((row->indicate_eob_p && EQ (boundary_bot, Qright)) | 937 | right = ((row->indicate_eob_p && EQ (boundary_bot, Qright)) |
| 935 | ? RIGHT_BRACKET_BITMAP : TOP_RIGHT_ANGLE_BITMAP); | 938 | ? (row->ends_at_zv_p |
| 939 | ? TOP_LEFT_ANGLE_BITMAP : RIGHT_BRACKET_BITMAP) | ||
| 940 | : TOP_RIGHT_ANGLE_BITMAP); | ||
| 936 | else if (row->indicate_eob_p && EQ (boundary_bot, Qright)) | 941 | else if (row->indicate_eob_p && EQ (boundary_bot, Qright)) |
| 937 | right = BOTTOM_RIGHT_ANGLE_BITMAP; | 942 | right = (row->ends_at_zv_p |
| 943 | ? TOP_LEFT_ANGLE_BITMAP : BOTTOM_RIGHT_ANGLE_BITMAP); | ||
| 938 | else if (row->continued_p) | 944 | else if (row->continued_p) |
| 939 | right = CONTINUED_LINE_BITMAP; | 945 | right = CONTINUED_LINE_BITMAP; |
| 940 | else if (row->indicate_top_line_p && EQ (arrow_top, Qright)) | 946 | else if (row->indicate_top_line_p && EQ (arrow_top, Qright)) |