projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| ad28a8ff AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: patch 7.1.029 | |
| 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.029 (after 7.1.019) | |
| 11 | Problem: Can't compile when all interfaces are used. (Taylor Venable) | |
| 12 | Solution: Only check for ex_script_ni when it's defined. | |
| 13 | Files: src/ex_docmd.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.1.028/src/ex_docmd.c Thu Jul 5 09:53:20 2007 | |
| 17 | --- src/ex_docmd.c Sun Jul 15 17:20:09 2007 | |
| 18 | *************** | |
| 19 | *** 133,138 **** | |
| 20 | --- 133,139 ---- | |
| 21 | static void get_flags __ARGS((exarg_T *eap)); | |
| 22 | #if !defined(FEAT_PERL) || !defined(FEAT_PYTHON) || !defined(FEAT_TCL) \ | |
| 23 | || !defined(FEAT_RUBY) || !defined(FEAT_MZSCHEME) | |
| 24 | + # define HAVE_EX_SCRIPT_NI | |
| 25 | static void ex_script_ni __ARGS((exarg_T *eap)); | |
| 26 | #endif | |
| 27 | static char_u *invalid_range __ARGS((exarg_T *eap)); | |
| 28 | *************** | |
| 29 | *** 2119,2125 **** | |
| 30 | !USER_CMDIDX(ea.cmdidx) && | |
| 31 | #endif | |
| 32 | (cmdnames[ea.cmdidx].cmd_func == ex_ni | |
| 33 | ! || cmdnames[ea.cmdidx].cmd_func == ex_script_ni)); | |
| 34 | ||
| 35 | #ifndef FEAT_EVAL | |
| 36 | /* | |
| 37 | --- 2120,2129 ---- | |
| 38 | !USER_CMDIDX(ea.cmdidx) && | |
| 39 | #endif | |
| 40 | (cmdnames[ea.cmdidx].cmd_func == ex_ni | |
| 41 | ! #ifdef HAVE_EX_SCRIPT_NI | |
| 42 | ! || cmdnames[ea.cmdidx].cmd_func == ex_script_ni | |
| 43 | ! #endif | |
| 44 | ! )); | |
| 45 | ||
| 46 | #ifndef FEAT_EVAL | |
| 47 | /* | |
| 48 | *************** | |
| 49 | *** 3998,4005 **** | |
| 50 | eap->errmsg = (char_u *)N_("E319: Sorry, the command is not available in this version"); | |
| 51 | } | |
| 52 | ||
| 53 | ! #if !defined(FEAT_PERL) || !defined(FEAT_PYTHON) || !defined(FEAT_TCL) \ | |
| 54 | ! || !defined(FEAT_RUBY) || !defined(FEAT_MZSCHEME) | |
| 55 | /* | |
| 56 | * Function called for script command which is Not Implemented. NI! | |
| 57 | * Skips over ":perl <<EOF" constructs. | |
| 58 | --- 3999,4005 ---- | |
| 59 | eap->errmsg = (char_u *)N_("E319: Sorry, the command is not available in this version"); | |
| 60 | } | |
| 61 | ||
| 62 | ! #ifdef HAVE_EX_SCRIPT_NI | |
| 63 | /* | |
| 64 | * Function called for script command which is Not Implemented. NI! | |
| 65 | * Skips over ":perl <<EOF" constructs. | |
| 66 | *** ../vim-7.1.028/src/version.c Tue Jul 10 17:25:20 2007 | |
| 67 | --- src/version.c Mon Jul 16 20:37:48 2007 | |
| 68 | *************** | |
| 69 | *** 668,669 **** | |
| 70 | --- 668,671 ---- | |
| 71 | { /* Add new patch number below this line */ | |
| 72 | + /**/ | |
| 73 | + 29, | |
| 74 | /**/ | |
| 75 | ||
| 76 | -- | |
| 77 | I used to wonder about the meaning of life. But I looked it | |
| 78 | up in the dictionary under "L" and there it was - the meaning | |
| 79 | of life. It was less than I expected. - Dogbert | |
| 80 | ||
| 81 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 82 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 83 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 84 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |