projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| d2415672 AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.1.187 | |
| 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.187 | |
| 11 | Problem: Win32 GUI: Custom completion using system() no longer works | |
| 12 | after patch 7.1.104. (Erik Falor) | |
| 13 | Solution: Loop when safe_vgetc() returns K_IGNORE. | |
| 14 | Files: src/ex_getln.c | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-7.1.186/src/ex_getln.c Fri Dec 7 20:28:13 2007 | |
| 18 | --- src/ex_getln.c Wed Jan 2 21:42:51 2008 | |
| 19 | *************** | |
| 20 | *** 335,341 **** | |
| 21 | quit_more = FALSE; /* reset after CTRL-D which had a more-prompt */ | |
| 22 | ||
| 23 | cursorcmd(); /* set the cursor on the right spot */ | |
| 24 | ! c = safe_vgetc(); | |
| 25 | if (KeyTyped) | |
| 26 | { | |
| 27 | some_key_typed = TRUE; | |
| 28 | --- 335,348 ---- | |
| 29 | quit_more = FALSE; /* reset after CTRL-D which had a more-prompt */ | |
| 30 | ||
| 31 | cursorcmd(); /* set the cursor on the right spot */ | |
| 32 | ! | |
| 33 | ! /* Get a character. Ignore K_IGNORE, it should not do anything, such | |
| 34 | ! * as stop completion. */ | |
| 35 | ! do | |
| 36 | ! { | |
| 37 | ! c = safe_vgetc(); | |
| 38 | ! } while (c == K_IGNORE); | |
| 39 | ! | |
| 40 | if (KeyTyped) | |
| 41 | { | |
| 42 | some_key_typed = TRUE; | |
| 43 | *************** | |
| 44 | *** 1209,1215 **** | |
| 45 | goto cmdline_not_changed; | |
| 46 | ||
| 47 | case K_IGNORE: | |
| 48 | ! goto cmdline_not_changed; /* Ignore mouse */ | |
| 49 | ||
| 50 | #ifdef FEAT_GUI_W32 | |
| 51 | /* On Win32 ignore <M-F4>, we get it when closing the window was | |
| 52 | --- 1216,1223 ---- | |
| 53 | goto cmdline_not_changed; | |
| 54 | ||
| 55 | case K_IGNORE: | |
| 56 | ! /* Ignore mouse event or ex_window() result. */ | |
| 57 | ! goto cmdline_not_changed; | |
| 58 | ||
| 59 | #ifdef FEAT_GUI_W32 | |
| 60 | /* On Win32 ignore <M-F4>, we get it when closing the window was | |
| 61 | *** ../vim-7.1.186/src/version.c Wed Jan 2 21:07:32 2008 | |
| 62 | --- src/version.c Wed Jan 2 21:53:24 2008 | |
| 63 | *************** | |
| 64 | *** 668,669 **** | |
| 65 | --- 668,671 ---- | |
| 66 | { /* Add new patch number below this line */ | |
| 67 | + /**/ | |
| 68 | + 187, | |
| 69 | /**/ | |
| 70 | ||
| 71 | -- | |
| 72 | FATHER: Who are you? | |
| 73 | PRINCE: I'm ... your son ... | |
| 74 | FATHER: Not you. | |
| 75 | LAUNCELOT: I'm ... er ... Sir Launcelot, sir. | |
| 76 | "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD | |
| 77 | ||
| 78 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 79 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 80 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 81 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |