Mercurial > hg > xemacs-beta
comparison src/gutter.c @ 4990:8f0cf4fd3d2c
Automatic merge
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Sat, 06 Feb 2010 04:01:46 -0600 |
| parents | 0d4c9d0f6a8d |
| children | 9410323e4b0d d0c14ea98592 |
comparison
equal
deleted
inserted
replaced
| 4989:d2ec55325515 | 4990:8f0cf4fd3d2c |
|---|---|
| 300 /* grab coordinates of last line */ | 300 /* grab coordinates of last line */ |
| 301 if (Dynarr_length (ddla)) | 301 if (Dynarr_length (ddla)) |
| 302 { | 302 { |
| 303 dl = Dynarr_atp (ddla, Dynarr_length (ddla) - 1); | 303 dl = Dynarr_atp (ddla, Dynarr_length (ddla) - 1); |
| 304 size = (dl->ypos + dl->descent - dl->clip) | 304 size = (dl->ypos + dl->descent - dl->clip) |
| 305 - (Dynarr_atp (ddla, 0)->ypos - Dynarr_atp (ddla, 0)->ascent); | 305 - (Dynarr_begin (ddla)->ypos - Dynarr_begin (ddla)->ascent); |
| 306 } | 306 } |
| 307 } | 307 } |
| 308 /* For left and right we have to do some maths. */ | 308 /* For left and right we have to do some maths. */ |
| 309 else | 309 else |
| 310 { | 310 { |
| 448 } | 448 } |
| 449 | 449 |
| 450 /* If the number of display lines has shrunk, adjust. */ | 450 /* If the number of display lines has shrunk, adjust. */ |
| 451 if (cdla_len > Dynarr_length (ddla)) | 451 if (cdla_len > Dynarr_length (ddla)) |
| 452 { | 452 { |
| 453 Dynarr_length (cdla) = Dynarr_length (ddla); | 453 Dynarr_set_length (cdla, Dynarr_length (ddla)); |
| 454 } | 454 } |
| 455 | 455 |
| 456 /* grab coordinates of last line and blank after it. */ | 456 /* grab coordinates of last line and blank after it. */ |
| 457 if (Dynarr_length (ddla) > 0) | 457 if (Dynarr_length (ddla) > 0) |
| 458 { | 458 { |