projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| dec2615e ER |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.098 | |
| 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.098 | |
| 11 | Problem: Function that ignores error still causes called_emsg to be set. | |
| 12 | E.g. when expand() fails the status line is disabled. | |
| 13 | Solution: Move check for emsg_not_now() up. (James Vega) | |
| 14 | Files: src/message.c | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-7.3.097/src/message.c 2010-10-20 21:22:17.000000000 +0200 | |
| 18 | --- src/message.c 2011-01-04 19:19:04.000000000 +0100 | |
| 19 | *************** | |
| 20 | *** 569,574 **** | |
| 21 | --- 569,578 ---- | |
| 22 | int severe; | |
| 23 | #endif | |
| 24 | ||
| 25 | + /* Skip this if not giving error messages at the moment. */ | |
| 26 | + if (emsg_not_now()) | |
| 27 | + return TRUE; | |
| 28 | + | |
| 29 | called_emsg = TRUE; | |
| 30 | ex_exitval = 1; | |
| 31 | ||
| 32 | *************** | |
| 33 | *** 581,590 **** | |
| 34 | emsg_severe = FALSE; | |
| 35 | #endif | |
| 36 | ||
| 37 | - /* Skip this if not giving error messages at the moment. */ | |
| 38 | - if (emsg_not_now()) | |
| 39 | - return TRUE; | |
| 40 | - | |
| 41 | if (!emsg_off || vim_strchr(p_debug, 't') != NULL) | |
| 42 | { | |
| 43 | #ifdef FEAT_EVAL | |
| 44 | --- 585,590 ---- | |
| 45 | *** ../vim-7.3.097/src/version.c 2011-01-04 19:03:22.000000000 +0100 | |
| 46 | --- src/version.c 2011-01-04 19:24:30.000000000 +0100 | |
| 47 | *************** | |
| 48 | *** 716,717 **** | |
| 49 | --- 716,719 ---- | |
| 50 | { /* Add new patch number below this line */ | |
| 51 | + /**/ | |
| 52 | + 98, | |
| 53 | /**/ | |
| 54 | ||
| 55 | -- | |
| 56 | Ed's Radiator Shop: The Best Place in Town to Take a Leak. | |
| 57 | ||
| 58 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 59 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 60 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
| 61 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |