projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 7fd9e930 ER |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.139 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.3.139 (after 7.3.137) | |
| 11 | Problem: When 'lazyredraw' is set ":ver" output can't be read. | |
| 12 | Solution: Don't redraw the screen when at a prompt or command line. | |
| 13 | Files: src/getchar.c, src/message.c, src/misc1.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.3.138/src/getchar.c 2011-03-03 15:04:01.000000000 +0100 | |
| 17 | --- src/getchar.c 2011-03-22 12:16:23.000000000 +0100 | |
| 18 | *************** | |
| 19 | *** 2713,2719 **** | |
| 20 | * changed text so far. Also for when 'lazyredraw' is set and | |
| 21 | * redrawing was postponed because there was something in the | |
| 22 | * input buffer (e.g., termresponse). */ | |
| 23 | ! if (((State & INSERT) || p_lz) && advance && must_redraw != 0) | |
| 24 | { | |
| 25 | update_screen(0); | |
| 26 | setcursor(); /* put cursor back where it belongs */ | |
| 27 | --- 2713,2720 ---- | |
| 28 | * changed text so far. Also for when 'lazyredraw' is set and | |
| 29 | * redrawing was postponed because there was something in the | |
| 30 | * input buffer (e.g., termresponse). */ | |
| 31 | ! if (((State & INSERT) != 0 || p_lz) && (State & CMDLINE) == 0 | |
| 32 | ! && advance && must_redraw != 0 && !need_wait_return) | |
| 33 | { | |
| 34 | update_screen(0); | |
| 35 | setcursor(); /* put cursor back where it belongs */ | |
| 36 | *** ../vim-7.3.138/src/message.c 2011-02-01 17:12:20.000000000 +0100 | |
| 37 | --- src/message.c 2011-03-22 13:06:24.000000000 +0100 | |
| 38 | *************** | |
| 39 | *** 879,894 **** | |
| 40 | if (msg_silent != 0) | |
| 41 | return; | |
| 42 | ||
| 43 | ! /* | |
| 44 | ! * With the global command (and some others) we only need one return at the | |
| 45 | ! * end. Adjust cmdline_row to avoid the next message overwriting the last one. | |
| 46 | ! * When inside vgetc(), we can't wait for a typed character at all. | |
| 47 | ! */ | |
| 48 | if (vgetc_busy > 0) | |
| 49 | return; | |
| 50 | if (no_wait_return) | |
| 51 | { | |
| 52 | - need_wait_return = TRUE; | |
| 53 | if (!exmode_active) | |
| 54 | cmdline_row = msg_row; | |
| 55 | return; | |
| 56 | --- 879,895 ---- | |
| 57 | if (msg_silent != 0) | |
| 58 | return; | |
| 59 | ||
| 60 | ! /* | |
| 61 | ! * When inside vgetc(), we can't wait for a typed character at all. | |
| 62 | ! * With the global command (and some others) we only need one return at | |
| 63 | ! * the end. Adjust cmdline_row to avoid the next message overwriting the | |
| 64 | ! * last one. | |
| 65 | ! */ | |
| 66 | if (vgetc_busy > 0) | |
| 67 | return; | |
| 68 | + need_wait_return = TRUE; | |
| 69 | if (no_wait_return) | |
| 70 | { | |
| 71 | if (!exmode_active) | |
| 72 | cmdline_row = msg_row; | |
| 73 | return; | |
| 74 | *** ../vim-7.3.138/src/misc1.c 2011-03-03 15:04:01.000000000 +0100 | |
| 75 | --- src/misc1.c 2011-03-22 12:15:26.000000000 +0100 | |
| 76 | *************** | |
| 77 | *** 3116,3122 **** | |
| 78 | ||
| 79 | if (n == KEYLEN_REMOVED) /* key code removed */ | |
| 80 | { | |
| 81 | ! if (must_redraw) | |
| 82 | { | |
| 83 | /* Redrawing was postponed, do it now. */ | |
| 84 | update_screen(0); | |
| 85 | --- 3116,3122 ---- | |
| 86 | ||
| 87 | if (n == KEYLEN_REMOVED) /* key code removed */ | |
| 88 | { | |
| 89 | ! if (must_redraw != 0 && !need_wait_return && (State & CMDLINE) == 0) | |
| 90 | { | |
| 91 | /* Redrawing was postponed, do it now. */ | |
| 92 | update_screen(0); | |
| 93 | *** ../vim-7.3.138/src/version.c 2011-03-03 15:54:45.000000000 +0100 | |
| 94 | --- src/version.c 2011-03-22 13:06:33.000000000 +0100 | |
| 95 | *************** | |
| 96 | *** 716,717 **** | |
| 97 | --- 716,719 ---- | |
| 98 | { /* Add new patch number below this line */ | |
| 99 | + /**/ | |
| 100 | + 139, | |
| 101 | /**/ | |
| 102 | ||
| 103 | -- | |
| 104 | "Software is like sex... it's better when it's free." | |
| 105 | -- Linus Torvalds, initiator of the free Linux OS | |
| 106 | Makes me wonder what FSF stands for...? | |
| 107 | ||
| 108 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 109 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 110 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
| 111 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |