aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2000-04-25 19:39:59 +0000
committerGerd Moellmann2000-04-25 19:39:59 +0000
commit86c11ba1c88dd4184e9285fddf4499ecbdffcc9a (patch)
treee48946999920e91a82c0322f730d4afa0756e35f
parent84fc6d4d2d9c78f489efa27604969c5fc7a0b296 (diff)
downloademacs-86c11ba1c88dd4184e9285fddf4499ecbdffcc9a.tar.gz
emacs-86c11ba1c88dd4184e9285fddf4499ecbdffcc9a.zip
(increment_matrix_positions): Renamed from
increment_glyph_matrix_buffer_positions. (increment_row_positions): Renamed from increment_glyph_row_buffer_positions.
-rw-r--r--src/dispnew.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/src/dispnew.c b/src/dispnew.c
index 7bd57182b3c..10d208958cb 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -781,8 +781,7 @@ rotate_matrix (matrix, first, last, by)
781 DELTA_BYTES. */ 781 DELTA_BYTES. */
782 782
783void 783void
784increment_glyph_matrix_buffer_positions (matrix, start, end, delta, 784increment_matrix_positions (matrix, start, end, delta, delta_bytes)
785 delta_bytes)
786 struct glyph_matrix *matrix; 785 struct glyph_matrix *matrix;
787 int start, end, delta, delta_bytes; 786 int start, end, delta, delta_bytes;
788{ 787{
@@ -792,8 +791,7 @@ increment_glyph_matrix_buffer_positions (matrix, start, end, delta,
792 xassert (start <= end); 791 xassert (start <= end);
793 792
794 for (; start < end; ++start) 793 for (; start < end; ++start)
795 increment_glyph_row_buffer_positions (matrix->rows + start, 794 increment_row_positions (matrix->rows + start, delta, delta_bytes);
796 delta, delta_bytes);
797} 795}
798 796
799 797
@@ -1030,7 +1028,7 @@ blank_row (w, row, y)
1030 ends. */ 1028 ends. */
1031 1029
1032void 1030void
1033increment_glyph_row_buffer_positions (row, delta, delta_bytes) 1031increment_row_positions (row, delta, delta_bytes)
1034 struct glyph_row *row; 1032 struct glyph_row *row;
1035 int delta, delta_bytes; 1033 int delta, delta_bytes;
1036{ 1034{
@@ -1154,7 +1152,7 @@ copy_glyph_row_contents (to, from, delta, delta_bytes)
1154 from->used[area] * sizeof (struct glyph)); 1152 from->used[area] * sizeof (struct glyph));
1155 1153
1156 /* Increment buffer positions in TO by DELTA. */ 1154 /* Increment buffer positions in TO by DELTA. */
1157 increment_glyph_row_buffer_positions (to, delta, delta_bytes); 1155 increment_row_positions (to, delta, delta_bytes);
1158} 1156}
1159 1157
1160 1158
@@ -3278,10 +3276,10 @@ direct_output_for_insert (g)
3278 } 3276 }
3279 3277
3280 /* Adjust positions in lines following the one we are in. */ 3278 /* Adjust positions in lines following the one we are in. */
3281 increment_glyph_matrix_buffer_positions (w->current_matrix, 3279 increment_matrix_positions (w->current_matrix,
3282 w->cursor.vpos + 1, 3280 w->cursor.vpos + 1,
3283 w->current_matrix->nrows, 3281 w->current_matrix->nrows,
3284 delta, delta_bytes); 3282 delta, delta_bytes);
3285 3283
3286 glyph_row->contains_overlapping_glyphs_p 3284 glyph_row->contains_overlapping_glyphs_p
3287 |= it.glyph_row->contains_overlapping_glyphs_p; 3285 |= it.glyph_row->contains_overlapping_glyphs_p;