projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| baa3863f ER |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.1.241 | |
| 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.241 | |
| 11 | Problem: Focus change events not always ignored. (Erik Falor) | |
| 12 | Solution: Ignore K_IGNORE in Insert mode in a few more places. | |
| 13 | Files: src/edit.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.1.240/src/edit.c Wed Jan 16 20:01:14 2008 | |
| 17 | --- src/edit.c Tue Jan 22 17:45:32 2008 | |
| 18 | *************** | |
| 19 | *** 703,712 **** | |
| 20 | #endif | |
| 21 | ||
| 22 | /* | |
| 23 | ! * Get a character for Insert mode. | |
| 24 | */ | |
| 25 | lastc = c; /* remember previous char for CTRL-D */ | |
| 26 | ! c = safe_vgetc(); | |
| 27 | ||
| 28 | #ifdef FEAT_AUTOCMD | |
| 29 | /* Don't want K_CURSORHOLD for the second key, e.g., after CTRL-V. */ | |
| 30 | --- 703,715 ---- | |
| 31 | #endif | |
| 32 | ||
| 33 | /* | |
| 34 | ! * Get a character for Insert mode. Ignore K_IGNORE. | |
| 35 | */ | |
| 36 | lastc = c; /* remember previous char for CTRL-D */ | |
| 37 | ! do | |
| 38 | ! { | |
| 39 | ! c = safe_vgetc(); | |
| 40 | ! } while (c == K_IGNORE); | |
| 41 | ||
| 42 | #ifdef FEAT_AUTOCMD | |
| 43 | /* Don't want K_CURSORHOLD for the second key, e.g., after CTRL-V. */ | |
| 44 | *************** | |
| 45 | *** 777,783 **** | |
| 46 | /* Prepare for or stop CTRL-X mode. This doesn't do completion, but | |
| 47 | * it does fix up the text when finishing completion. */ | |
| 48 | compl_get_longest = FALSE; | |
| 49 | ! if (c != K_IGNORE && ins_compl_prep(c)) | |
| 50 | continue; | |
| 51 | #endif | |
| 52 | ||
| 53 | --- 780,786 ---- | |
| 54 | /* Prepare for or stop CTRL-X mode. This doesn't do completion, but | |
| 55 | * it does fix up the text when finishing completion. */ | |
| 56 | compl_get_longest = FALSE; | |
| 57 | ! if (ins_compl_prep(c)) | |
| 58 | continue; | |
| 59 | #endif | |
| 60 | ||
| 61 | *************** | |
| 62 | *** 4516,4530 **** | |
| 63 | else | |
| 64 | { | |
| 65 | /* Need to get the character to have KeyTyped set. We'll put it | |
| 66 | ! * back with vungetc() below. */ | |
| 67 | c = safe_vgetc(); | |
| 68 | ||
| 69 | ! /* Don't interrupt completion when the character wasn't typed, | |
| 70 | ! * e.g., when doing @q to replay keys. */ | |
| 71 | ! if (c != Ctrl_R && KeyTyped) | |
| 72 | ! compl_interrupted = TRUE; | |
| 73 | ! | |
| 74 | ! vungetc(c); | |
| 75 | } | |
| 76 | } | |
| 77 | if (compl_pending != 0 && !got_int) | |
| 78 | --- 4519,4535 ---- | |
| 79 | else | |
| 80 | { | |
| 81 | /* Need to get the character to have KeyTyped set. We'll put it | |
| 82 | ! * back with vungetc() below. But skip K_IGNORE. */ | |
| 83 | c = safe_vgetc(); | |
| 84 | + if (c != K_IGNORE) | |
| 85 | + { | |
| 86 | + /* Don't interrupt completion when the character wasn't typed, | |
| 87 | + * e.g., when doing @q to replay keys. */ | |
| 88 | + if (c != Ctrl_R && KeyTyped) | |
| 89 | + compl_interrupted = TRUE; | |
| 90 | ||
| 91 | ! vungetc(c); | |
| 92 | ! } | |
| 93 | } | |
| 94 | } | |
| 95 | if (compl_pending != 0 && !got_int) | |
| 96 | *** ../vim-7.1.240/src/version.c Tue Jan 22 16:01:25 2008 | |
| 97 | --- src/version.c Tue Jan 22 17:48:46 2008 | |
| 98 | *************** | |
| 99 | *** 668,669 **** | |
| 100 | --- 668,671 ---- | |
| 101 | { /* Add new patch number below this line */ | |
| 102 | + /**/ | |
| 103 | + 241, | |
| 104 | /**/ | |
| 105 | ||
| 106 | -- | |
| 107 | The problem with political jokes is that they get elected. | |
| 108 | ||
| 109 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 110 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 111 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 112 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |