projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| c84df032 ER |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.0.172 | |
| 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.0.172 | |
| 11 | Problem: Crash when recovering and quitting at the "press-enter" prompt. | |
| 12 | Solution: Check for "msg_list" to be NULL. (Liu Yubao) | |
| 13 | Files: src/ex_eval.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.0.171/src/ex_eval.c Sun Apr 23 00:28:06 2006 | |
| 17 | --- src/ex_eval.c Tue Nov 28 18:30:23 2006 | |
| 18 | *************** | |
| 19 | *** 340,346 **** | |
| 20 | ||
| 21 | /* If no exception is to be thrown or the conversion should be done after | |
| 22 | * returning to a previous invocation of do_one_cmd(), do nothing. */ | |
| 23 | ! if (*msg_list == NULL) | |
| 24 | return; | |
| 25 | ||
| 26 | if (throw_exception(*msg_list, ET_ERROR, cmdname) == FAIL) | |
| 27 | --- 340,346 ---- | |
| 28 | ||
| 29 | /* If no exception is to be thrown or the conversion should be done after | |
| 30 | * returning to a previous invocation of do_one_cmd(), do nothing. */ | |
| 31 | ! if (msg_list == NULL || *msg_list == NULL) | |
| 32 | return; | |
| 33 | ||
| 34 | if (throw_exception(*msg_list, ET_ERROR, cmdname) == FAIL) | |
| 35 | *************** | |
| 36 | *** 2026,2033 **** | |
| 37 | ||
| 38 | /* If an error was about to be converted to an exception when | |
| 39 | * enter_cleanup() was called, free the message list. */ | |
| 40 | ! free_msglist(*msg_list); | |
| 41 | ! *msg_list = NULL; | |
| 42 | } | |
| 43 | ||
| 44 | /* | |
| 45 | --- 2026,2036 ---- | |
| 46 | ||
| 47 | /* If an error was about to be converted to an exception when | |
| 48 | * enter_cleanup() was called, free the message list. */ | |
| 49 | ! if (msg_list != NULL) | |
| 50 | ! { | |
| 51 | ! free_msglist(*msg_list); | |
| 52 | ! *msg_list = NULL; | |
| 53 | ! } | |
| 54 | } | |
| 55 | ||
| 56 | /* | |
| 57 | *** ../vim-7.0.171/src/version.c Tue Nov 28 17:44:51 2006 | |
| 58 | --- src/version.c Tue Nov 28 18:32:50 2006 | |
| 59 | *************** | |
| 60 | *** 668,669 **** | |
| 61 | --- 668,671 ---- | |
| 62 | { /* Add new patch number below this line */ | |
| 63 | + /**/ | |
| 64 | + 172, | |
| 65 | /**/ | |
| 66 | ||
| 67 | -- | |
| 68 | GUARD #1: Where'd you get the coconut? | |
| 69 | ARTHUR: We found them. | |
| 70 | GUARD #1: Found them? In Mercea? The coconut's tropical! | |
| 71 | ARTHUR: What do you mean? | |
| 72 | GUARD #1: Well, this is a temperate zone. | |
| 73 | The Quest for the Holy Grail (Monty Python) | |
| 74 | ||
| 75 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 76 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 77 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 78 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |