Mercurial > emacs
diff src/nsterm.m @ 109302:60516122d066
Merge changes from emacs-23 branch.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Sat, 10 Jul 2010 14:52:53 -0400 |
parents | 750db9f3e6d8 f6f0d450d542 |
children | 9cfca8c9fb07 |
line wrap: on
line diff
--- a/src/nsterm.m Sat Jul 10 17:29:46 2010 +0300 +++ b/src/nsterm.m Sat Jul 10 14:52:53 2010 -0400 @@ -2177,20 +2177,7 @@ /* Must clip because of partially visible lines. */ rowY = WINDOW_TO_FRAME_PIXEL_Y (w, row->y); - if (p->y < rowY) - { - /* Adjust position of "bottom aligned" bitmap on partially - visible last row. */ - int oldY = row->y; - int oldVH = row->visible_height; - row->visible_height = p->h; - row->y -= rowY - p->y; - ns_clip_to_row (w, row, -1, NO); - row->y = oldY; - row->visible_height = oldVH; - } - else - ns_clip_to_row (w, row, -1, YES); + ns_clip_to_row (w, row, -1, YES); if (p->bx >= 0 && !p->overlay_p) {