projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 717fd8f6 AF |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 6.2.079 | |
| 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 6.2.079 | |
| 11 | Problem: ":w ++enc=utf-8 !cmd" doesn't work. | |
| 12 | Solution: Check for the "++" argument before the "!". | |
| 13 | Files: src/ex_docmd.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-6.2.078/src/ex_docmd.c Sun Aug 10 22:24:37 2003 | |
| 17 | --- src/ex_docmd.c Sun Sep 7 14:26:29 2003 | |
| 18 | *************** | |
| 19 | *** 1867,1872 **** | |
| 20 | --- 1867,1884 ---- | |
| 21 | else | |
| 22 | ea.arg = skipwhite(p); | |
| 23 | ||
| 24 | + /* | |
| 25 | + * Check for "++opt=val" argument. | |
| 26 | + * Must be first, allow ":w ++enc=utf8 !cmd" | |
| 27 | + */ | |
| 28 | + if (ea.argt & ARGOPT) | |
| 29 | + while (ea.arg[0] == '+' && ea.arg[1] == '+') | |
| 30 | + if (getargopt(&ea) == FAIL && !ni) | |
| 31 | + { | |
| 32 | + errormsg = (char_u *)_(e_invarg); | |
| 33 | + goto doend; | |
| 34 | + } | |
| 35 | + | |
| 36 | if (ea.cmdidx == CMD_write || ea.cmdidx == CMD_update) | |
| 37 | { | |
| 38 | if (*ea.arg == '>') /* append */ | |
| 39 | *************** | |
| 40 | *** 1912,1928 **** | |
| 41 | } | |
| 42 | ||
| 43 | /* | |
| 44 | - * Check for "++opt=val" argument. | |
| 45 | - */ | |
| 46 | - if (ea.argt & ARGOPT) | |
| 47 | - while (ea.arg[0] == '+' && ea.arg[1] == '+') | |
| 48 | - if (getargopt(&ea) == FAIL && !ni) | |
| 49 | - { | |
| 50 | - errormsg = (char_u *)_(e_invarg); | |
| 51 | - goto doend; | |
| 52 | - } | |
| 53 | - | |
| 54 | - /* | |
| 55 | * Check for "+command" argument, before checking for next command. | |
| 56 | * Don't do this for ":read !cmd" and ":write !cmd". | |
| 57 | */ | |
| 58 | --- 1924,1929 ---- | |
| 59 | *** ../vim-6.2.078/src/version.c Wed Sep 10 21:51:27 2003 | |
| 60 | --- src/version.c Wed Sep 10 22:39:12 2003 | |
| 61 | *************** | |
| 62 | *** 632,633 **** | |
| 63 | --- 632,635 ---- | |
| 64 | { /* Add new patch number below this line */ | |
| 65 | + /**/ | |
| 66 | + 79, | |
| 67 | /**/ | |
| 68 | ||
| 69 | -- | |
| 70 | BEDEVERE: Look! It's the old man from scene 24 - what's he Doing here? | |
| 71 | ARTHUR: He is the keeper of the Bridge. He asks each traveler five | |
| 72 | questions ... | |
| 73 | GALAHAD: Three questions. | |
| 74 | "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD | |
| 75 | ||
| 76 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 77 | /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ | |
| 78 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
| 79 | \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html /// |