projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| ad28a8ff AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: patch 7.1.012 | |
| 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.012 | |
| 11 | Problem: ":let &shiftwidth = 'asdf'" doesn't produce an error message. | |
| 12 | Solution: Check for a string argument. (Chris Lubinski) | |
| 13 | Files: src/option.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.1.011/src/option.c Sun May 6 15:37:32 2007 | |
| 17 | --- src/option.c Tue Jun 19 20:56:36 2007 | |
| 18 | *************** | |
| 19 | *** 8219,8224 **** | |
| 20 | --- 8219,8243 ---- | |
| 21 | varp = get_varp(&options[opt_idx]); | |
| 22 | if (varp != NULL) /* hidden option is not changed */ | |
| 23 | { | |
| 24 | + if (number == 0 && string != NULL) | |
| 25 | + { | |
| 26 | + int index; | |
| 27 | + | |
| 28 | + /* Either we are given a string or we are setting option | |
| 29 | + * to zero. */ | |
| 30 | + for (index = 0; string[index] == '0'; ++index) | |
| 31 | + ; | |
| 32 | + if (string[index] != NUL || index == 0) | |
| 33 | + { | |
| 34 | + /* There's another character after zeros or the string | |
| 35 | + * is empty. In both cases, we are trying to set a | |
| 36 | + * num option using a string. */ | |
| 37 | + EMSG3(_("E521: Number required: &%s = '%s'"), | |
| 38 | + name, string); | |
| 39 | + return; /* do nothing as we hit an error */ | |
| 40 | + | |
| 41 | + } | |
| 42 | + } | |
| 43 | if (flags & P_NUM) | |
| 44 | (void)set_num_option(opt_idx, varp, number, | |
| 45 | NULL, 0, opt_flags); | |
| 46 | *** ../vim-7.1.011/src/version.c Tue Jun 19 20:30:46 2007 | |
| 47 | --- src/version.c Tue Jun 19 20:53:15 2007 | |
| 48 | *************** | |
| 49 | *** 668,669 **** | |
| 50 | --- 668,671 ---- | |
| 51 | { /* Add new patch number below this line */ | |
| 52 | + /**/ | |
| 53 | + 12, | |
| 54 | /**/ | |
| 55 | ||
| 56 | -- | |
| 57 | Ten million Linux users can't be wrong! | |
| 58 | ||
| 59 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 60 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 61 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 62 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |