Mercurial > vim

comparison src/message.c @ 1342:6974b167d75e v7.1.056

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.1-056
author vimboss
date Tue, 07 Aug 2007 20:00:31 +0000
parents 3bfd2e1e2609
children 826f00fef9e3
comparison
equal deleted inserted replaced
1341:2ae2dd2591fa 1342:6974b167d75e
1876 */ 1876 */
1877 if (t_col > 0) 1877 if (t_col > 0)
1878 /* output postponed text */ 1878 /* output postponed text */
1879 t_puts(&t_col, t_s, s, attr); 1879 t_puts(&t_col, t_s, s, attr);
1880 1880
1881 /* When no more prompt an no more room, truncate here */ 1881 /* When no more prompt and no more room, truncate here */
1882 if (msg_no_more && lines_left == 0) 1882 if (msg_no_more && lines_left == 0)
1883 break; 1883 break;
1884 1884
1885 /* Scroll the screen up one line. */ 1885 /* Scroll the screen up one line. */
1886 msg_scroll_up(); 1886 msg_scroll_up();
1925 1925
1926 /* 1926 /*
1927 * If screen is completely filled and 'more' is set then wait 1927 * If screen is completely filled and 'more' is set then wait
1928 * for a character. 1928 * for a character.
1929 */ 1929 */
1930 --lines_left; 1930 if (lines_left > 0)
1931 --lines_left;
1931 if (p_more && lines_left == 0 && State != HITRETURN 1932 if (p_more && lines_left == 0 && State != HITRETURN
1932 && !msg_no_more && !exmode_active) 1933 && !msg_no_more && !exmode_active)
1933 { 1934 {
1934 #ifdef FEAT_CON_DIALOG 1935 #ifdef FEAT_CON_DIALOG
1935 if (do_more_prompt(NUL)) 1936 if (do_more_prompt(NUL))
2232 void 2233 void
2233 show_sb_text() 2234 show_sb_text()
2234 { 2235 {
2235 msgchunk_T *mp; 2236 msgchunk_T *mp;
2236 2237
2237 /* Only show somethign if there is more than one line, otherwise it looks 2238 /* Only show something if there is more than one line, otherwise it looks
2238 * weird, typing a command without output results in one line. */ 2239 * weird, typing a command without output results in one line. */
2239 mp = msg_sb_start(last_msgchunk); 2240 mp = msg_sb_start(last_msgchunk);
2240 if (mp == NULL || mp->sb_prev == NULL) 2241 if (mp == NULL || mp->sb_prev == NULL)
2241 vim_beep(); 2242 vim_beep();
2242 else 2243 else
2620 mp_last = disp_sb_line((int)Rows - 2, mp_last); 2621 mp_last = disp_sb_line((int)Rows - 2, mp_last);
2621 --scroll; 2622 --scroll;
2622 } 2623 }
2623 } 2624 }
2624 2625
2625 if (scroll < 0 || (scroll == 0 && mp_last != NULL)) 2626 if (scroll <= 0)
2626 { 2627 {
2627 /* displayed the requested text, more prompt again */ 2628 /* displayed the requested text, more prompt again */
2628 screen_fill((int)Rows - 1, (int)Rows, 0, 2629 screen_fill((int)Rows - 1, (int)Rows, 0,
2629 (int)Columns, ' ', ' ', 0); 2630 (int)Columns, ' ', ' ', 0);
2630 msg_moremsg(FALSE); 2631 msg_moremsg(FALSE);