Mercurial > hg > xemacs-beta

comparison src/redisplay-output.c @ 282:c42ec1d1cded r21-0b39

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-0b39
author cvs
date Mon, 13 Aug 2007 10:33:18 +0200
parents c5d627a313b1
children 8626e4521993
comparison
equal deleted inserted replaced
281:090b52736db2 282:c42ec1d1cded
1040 int ddla_len = Dynarr_length (ddla); 1040 int ddla_len = Dynarr_length (ddla);
1041 1041
1042 ypos2 = WINDOW_TEXT_BOTTOM (w); 1042 ypos2 = WINDOW_TEXT_BOTTOM (w);
1043 #ifdef HAVE_SCROLLBARS 1043 #ifdef HAVE_SCROLLBARS
1044 /* This adjustment is to catch the intersection of any scrollbars. */ 1044 /* This adjustment is to catch the intersection of any scrollbars. */
1045 if (f->windows_structure_changed && !f->scrollbar_on_top) 1045 if (f->windows_structure_changed && NILP (w->scrollbar_on_top_p))
1046 ypos2 += window_scrollbar_height (w); 1046 ypos2 += window_scrollbar_height (w);
1047 #endif 1047 #endif
1048 1048
1049 if (ddla_len) 1049 if (ddla_len)
1050 { 1050 {
1051 if (ddla_len == 1 && Dynarr_atp (ddla, 0)->modeline) 1051 if (ddla_len == 1 && Dynarr_atp (ddla, 0)->modeline)
1052 { 1052 {
1053 ypos1 = WINDOW_TEXT_TOP (w); 1053 ypos1 = WINDOW_TEXT_TOP (w);
1054 #ifdef HAVE_SCROLLBARS 1054 #ifdef HAVE_SCROLLBARS
1055 /* This adjustment is to catch the intersection of any scrollbars. */ 1055 /* This adjustment is to catch the intersection of any scrollbars. */
1056 if (f->windows_structure_changed && f->scrollbar_on_top) 1056 if (f->windows_structure_changed && !NILP (w->scrollbar_on_top_p))
1057 ypos1 -= window_scrollbar_height (w); 1057 ypos1 -= window_scrollbar_height (w);
1058 #endif 1058 #endif
1059 } 1059 }
1060 else 1060 else
1061 { 1061 {