aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman2004-11-14 04:31:03 +0000
committerRichard M. Stallman2004-11-14 04:31:03 +0000
commit0b2e177e3e6946fa3968ee97f66af3c208c30e7f (patch)
tree059516a64d0b1619a2f18275e07acb2c76e50786 /src
parent9136818a8176838750326ff735f6cbcd76a26751 (diff)
downloademacs-0b2e177e3e6946fa3968ee97f66af3c208c30e7f.tar.gz
emacs-0b2e177e3e6946fa3968ee97f66af3c208c30e7f.zip
(reseat_at_previous_visible_line_start): No longer static.
(get_next_display_element): Fix latest change: applies only to \n.
Diffstat (limited to 'src')
-rw-r--r--src/xdisp.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index 1912937c1b7..14a64187f1c 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -892,7 +892,7 @@ static void next_overlay_string P_ ((struct it *));
892static void reseat P_ ((struct it *, struct text_pos, int)); 892static void reseat P_ ((struct it *, struct text_pos, int));
893static void reseat_1 P_ ((struct it *, struct text_pos, int)); 893static void reseat_1 P_ ((struct it *, struct text_pos, int));
894static void back_to_previous_visible_line_start P_ ((struct it *)); 894static void back_to_previous_visible_line_start P_ ((struct it *));
895static void reseat_at_previous_visible_line_start P_ ((struct it *)); 895void reseat_at_previous_visible_line_start P_ ((struct it *));
896static void reseat_at_next_visible_line_start P_ ((struct it *, int)); 896static void reseat_at_next_visible_line_start P_ ((struct it *, int));
897static int next_element_from_display_vector P_ ((struct it *)); 897static int next_element_from_display_vector P_ ((struct it *));
898static int next_element_from_string P_ ((struct it *)); 898static int next_element_from_string P_ ((struct it *));
@@ -4592,7 +4592,7 @@ back_to_previous_visible_line_start (it)
4592 selective display. At the end, update IT's overlay information, 4592 selective display. At the end, update IT's overlay information,
4593 face information etc. */ 4593 face information etc. */
4594 4594
4595static void 4595void
4596reseat_at_previous_visible_line_start (it) 4596reseat_at_previous_visible_line_start (it)
4597 struct it *it; 4597 struct it *it;
4598{ 4598{
@@ -4897,8 +4897,9 @@ get_next_display_element (it)
4897 translated to octal form. */ 4897 translated to octal form. */
4898 else if ((it->c < ' ' 4898 else if ((it->c < ' '
4899 && (it->area != TEXT_AREA 4899 && (it->area != TEXT_AREA
4900 /* In mode line, treat \n, \t like other crl chars. */ 4900 /* In mode line, treat \n like other crl chars. */
4901 || (it->glyph_row && it->glyph_row->mode_line_p) 4901 || (it->c == '\n'
4902 && it->glyph_row && it->glyph_row->mode_line_p)
4902 || (it->c != '\n' && it->c != '\t'))) 4903 || (it->c != '\n' && it->c != '\t')))
4903 || (it->multibyte_p 4904 || (it->multibyte_p
4904 ? ((it->c >= 127 4905 ? ((it->c >= 127