| 6577e359 |
1 | To: vim-dev@vim.org |
| 2 | Subject: patch 7.1.056 |
| 3 | Fcc: outbox |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> |
| 5 | Mime-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=ISO-8859-1 |
| 7 | Content-Transfer-Encoding: 8bit |
| 8 | ------------ |
| 9 | |
| 10 | Patch 7.1.056 |
| 11 | Problem: More prompt does not behave correctly after scrolling back. |
| 12 | (Randall W. Morris) |
| 13 | Solution: Avoid lines_left becomes negative. (Chris Lubinski) Don't check |
| 14 | mp_last when deciding to show the more prompt. (Martin Toft) |
| 15 | Files: src/message.c |
| 16 | |
| 17 | |
| 18 | *** ../vim-7.1.055/src/message.c Sun Aug 5 19:20:04 2007 |
| 19 | --- src/message.c Tue Aug 7 21:52:10 2007 |
| 20 | *************** |
| 21 | *** 1878,1884 **** |
| 22 | /* output postponed text */ |
| 23 | t_puts(&t_col, t_s, s, attr); |
| 24 | |
| 25 | ! /* When no more prompt an no more room, truncate here */ |
| 26 | if (msg_no_more && lines_left == 0) |
| 27 | break; |
| 28 | |
| 29 | --- 1878,1884 ---- |
| 30 | /* output postponed text */ |
| 31 | t_puts(&t_col, t_s, s, attr); |
| 32 | |
| 33 | ! /* When no more prompt and no more room, truncate here */ |
| 34 | if (msg_no_more && lines_left == 0) |
| 35 | break; |
| 36 | |
| 37 | *************** |
| 38 | *** 1927,1933 **** |
| 39 | * If screen is completely filled and 'more' is set then wait |
| 40 | * for a character. |
| 41 | */ |
| 42 | ! --lines_left; |
| 43 | if (p_more && lines_left == 0 && State != HITRETURN |
| 44 | && !msg_no_more && !exmode_active) |
| 45 | { |
| 46 | --- 1927,1934 ---- |
| 47 | * If screen is completely filled and 'more' is set then wait |
| 48 | * for a character. |
| 49 | */ |
| 50 | ! if (lines_left > 0) |
| 51 | ! --lines_left; |
| 52 | if (p_more && lines_left == 0 && State != HITRETURN |
| 53 | && !msg_no_more && !exmode_active) |
| 54 | { |
| 55 | *************** |
| 56 | *** 2234,2240 **** |
| 57 | { |
| 58 | msgchunk_T *mp; |
| 59 | |
| 60 | ! /* Only show somethign if there is more than one line, otherwise it looks |
| 61 | * weird, typing a command without output results in one line. */ |
| 62 | mp = msg_sb_start(last_msgchunk); |
| 63 | if (mp == NULL || mp->sb_prev == NULL) |
| 64 | --- 2235,2241 ---- |
| 65 | { |
| 66 | msgchunk_T *mp; |
| 67 | |
| 68 | ! /* Only show something if there is more than one line, otherwise it looks |
| 69 | * weird, typing a command without output results in one line. */ |
| 70 | mp = msg_sb_start(last_msgchunk); |
| 71 | if (mp == NULL || mp->sb_prev == NULL) |
| 72 | *************** |
| 73 | *** 2622,2628 **** |
| 74 | } |
| 75 | } |
| 76 | |
| 77 | ! if (scroll < 0 || (scroll == 0 && mp_last != NULL)) |
| 78 | { |
| 79 | /* displayed the requested text, more prompt again */ |
| 80 | screen_fill((int)Rows - 1, (int)Rows, 0, |
| 81 | --- 2623,2629 ---- |
| 82 | } |
| 83 | } |
| 84 | |
| 85 | ! if (scroll <= 0) |
| 86 | { |
| 87 | /* displayed the requested text, more prompt again */ |
| 88 | screen_fill((int)Rows - 1, (int)Rows, 0, |
| 89 | *** ../vim-7.1.055/src/version.c Mon Aug 6 22:27:13 2007 |
| 90 | --- src/version.c Tue Aug 7 21:57:02 2007 |
| 91 | *************** |
| 92 | *** 668,669 **** |
| 93 | --- 668,671 ---- |
| 94 | { /* Add new patch number below this line */ |
| 95 | + /**/ |
| 96 | + 56, |
| 97 | /**/ |
| 98 | |
| 99 | -- |
| 100 | From "know your smileys": |
| 101 | :-| :-| Deja' vu! |
| 102 | |
| 103 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ |
| 104 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ |
| 105 | \\\ download, build and distribute -- http://www.A-A-P.org /// |
| 106 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |
projects / packages / vim.git / blame