projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 437d9c61 ER |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.193 | |
| 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.193 | |
| 11 | Problem: In the command line window ":close" doesn't work properly. (Tony | |
| 12 | Mechelynck) | |
| 13 | Solution: Use Ctrl_C instead of K_IGNORE for cmdwin_result. (Jean-Rene | |
| 14 | David) | |
| 15 | Files: src/ex_docmd.c, src/ex_getln.c | |
| 16 | ||
| 17 | ||
| 18 | *** ../vim-7.3.192/src/ex_docmd.c 2011-05-10 16:41:13.000000000 +0200 | |
| 19 | --- src/ex_docmd.c 2011-05-19 14:42:56.000000000 +0200 | |
| 20 | *************** | |
| 21 | *** 6472,6478 **** | |
| 22 | { | |
| 23 | # ifdef FEAT_CMDWIN | |
| 24 | if (cmdwin_type != 0) | |
| 25 | ! cmdwin_result = K_IGNORE; | |
| 26 | else | |
| 27 | # endif | |
| 28 | if (!text_locked() | |
| 29 | --- 6472,6478 ---- | |
| 30 | { | |
| 31 | # ifdef FEAT_CMDWIN | |
| 32 | if (cmdwin_type != 0) | |
| 33 | ! cmdwin_result = Ctrl_C; | |
| 34 | else | |
| 35 | # endif | |
| 36 | if (!text_locked() | |
| 37 | *** ../vim-7.3.192/src/ex_getln.c 2011-04-28 17:21:49.000000000 +0200 | |
| 38 | --- src/ex_getln.c 2011-05-19 14:42:56.000000000 +0200 | |
| 39 | *************** | |
| 40 | *** 6324,6329 **** | |
| 41 | --- 6324,6335 ---- | |
| 42 | ccline.cmdbuff = vim_strsave((char_u *)"qa"); | |
| 43 | cmdwin_result = CAR; | |
| 44 | } | |
| 45 | + else if (cmdwin_result == Ctrl_C) | |
| 46 | + { | |
| 47 | + /* :q or :close, don't execute any command | |
| 48 | + * and don't modify the cmd window. */ | |
| 49 | + ccline.cmdbuff = NULL; | |
| 50 | + } | |
| 51 | else | |
| 52 | ccline.cmdbuff = vim_strsave(ml_get_curline()); | |
| 53 | if (ccline.cmdbuff == NULL) | |
| 54 | *** ../vim-7.3.192/src/version.c 2011-05-19 14:30:07.000000000 +0200 | |
| 55 | --- src/version.c 2011-05-19 14:48:12.000000000 +0200 | |
| 56 | *************** | |
| 57 | *** 711,712 **** | |
| 58 | --- 711,714 ---- | |
| 59 | { /* Add new patch number below this line */ | |
| 60 | + /**/ | |
| 61 | + 193, | |
| 62 | /**/ | |
| 63 | ||
| 64 | -- | |
| 65 | There's no place like $(HOME)! | |
| 66 | ||
| 67 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 68 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 69 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
| 70 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |