| 7b766f25 |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.288 |
| 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.288 |
| 11 | Problem: has('python') may give an error message for not being able to load |
| 12 | the library after using python3. |
| 13 | Solution: Only give the error when the verbose argument is true. |
| 14 | Files: src/if_python.c, src/if_python3.c |
| 15 | |
| 16 | |
| 17 | *** ../vim-7.3.287/src/if_python.c 2011-06-19 00:27:46.000000000 +0200 |
| 18 | --- src/if_python.c 2011-08-21 17:03:52.000000000 +0200 |
| 19 | *************** |
| 20 | *** 368,374 **** |
| 21 | * standard C extension libraries of one or both python versions. */ |
| 22 | if (python3_loaded()) |
| 23 | { |
| 24 | ! EMSG(_("E836: This Vim cannot execute :python after using :py3")); |
| 25 | return FAIL; |
| 26 | } |
| 27 | #endif |
| 28 | --- 368,375 ---- |
| 29 | * standard C extension libraries of one or both python versions. */ |
| 30 | if (python3_loaded()) |
| 31 | { |
| 32 | ! if (verbose) |
| 33 | ! EMSG(_("E836: This Vim cannot execute :python after using :py3")); |
| 34 | return FAIL; |
| 35 | } |
| 36 | #endif |
| 37 | *** ../vim-7.3.287/src/if_python3.c 2011-07-15 15:54:39.000000000 +0200 |
| 38 | --- src/if_python3.c 2011-08-21 17:05:19.000000000 +0200 |
| 39 | *************** |
| 40 | *** 367,373 **** |
| 41 | * standard C extension libraries of one or both python versions. */ |
| 42 | if (python_loaded()) |
| 43 | { |
| 44 | ! EMSG(_("E837: This Vim cannot execute :py3 after using :python")); |
| 45 | return FAIL; |
| 46 | } |
| 47 | # endif |
| 48 | --- 367,374 ---- |
| 49 | * standard C extension libraries of one or both python versions. */ |
| 50 | if (python_loaded()) |
| 51 | { |
| 52 | ! if (verbose) |
| 53 | ! EMSG(_("E837: This Vim cannot execute :py3 after using :python")); |
| 54 | return FAIL; |
| 55 | } |
| 56 | # endif |
| 57 | *** ../vim-7.3.287/src/version.c 2011-08-27 15:10:00.000000000 +0200 |
| 58 | --- src/version.c 2011-08-28 15:59:11.000000000 +0200 |
| 59 | *************** |
| 60 | *** 711,712 **** |
| 61 | --- 711,714 ---- |
| 62 | { /* Add new patch number below this line */ |
| 63 | + /**/ |
| 64 | + 288, |
| 65 | /**/ |
| 66 | |
| 67 | -- |
| 68 | FIRST SOLDIER: So they wouldn't be able to bring a coconut back anyway. |
| 69 | SECOND SOLDIER: Wait a minute! Suppose two swallows carried it together? |
| 70 | FIRST SOLDIER: No, they'd have to have it on a line. |
| 71 | "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD |
| 72 | |
| 73 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ |
| 74 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ |
| 75 | \\\ an exciting new programming language -- http://www.Zimbu.org /// |
| 76 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |
projects / packages / vim.git / blame