projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 5a088057 KK |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.637 | |
| 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.637 | |
| 11 | Problem: Cannot catch the error caused by a foldopen when there is no fold. | |
| 12 | (ZyX, Issue 48) | |
| 13 | Solution: Do not break out of the loop early when inside try/catch. | |
| 14 | (Christian Brabandt) Except when there is a syntax error. | |
| 15 | Files: src/ex_docmd.c, src/globals.h | |
| 16 | ||
| 17 | ||
| 18 | *** ../vim-7.3.636/src/ex_docmd.c 2012-08-15 14:04:50.000000000 +0200 | |
| 19 | --- src/ex_docmd.c 2012-08-23 18:39:08.000000000 +0200 | |
| 20 | *************** | |
| 21 | *** 1295,1301 **** | |
| 22 | && cstack.cs_trylevel == 0 | |
| 23 | #endif | |
| 24 | ) | |
| 25 | ! && !(did_emsg && used_getline | |
| 26 | && (getline_equal(fgetline, cookie, getexmodeline) | |
| 27 | || getline_equal(fgetline, cookie, getexline))) | |
| 28 | && (next_cmdline != NULL | |
| 29 | --- 1295,1308 ---- | |
| 30 | && cstack.cs_trylevel == 0 | |
| 31 | #endif | |
| 32 | ) | |
| 33 | ! && !(did_emsg | |
| 34 | ! #ifdef FEAT_EVAL | |
| 35 | ! /* Keep going when inside try/catch, so that the error can be | |
| 36 | ! * dealth with, except when it is a syntax error, it may cause | |
| 37 | ! * the :endtry to be missed. */ | |
| 38 | ! && (cstack.cs_trylevel == 0 || did_emsg_syntax) | |
| 39 | ! #endif | |
| 40 | ! && used_getline | |
| 41 | && (getline_equal(fgetline, cookie, getexmodeline) | |
| 42 | || getline_equal(fgetline, cookie, getexline))) | |
| 43 | && (next_cmdline != NULL | |
| 44 | *************** | |
| 45 | *** 1305,1310 **** | |
| 46 | --- 1312,1318 ---- | |
| 47 | || (flags & DOCMD_REPEAT))); | |
| 48 | ||
| 49 | vim_free(cmdline_copy); | |
| 50 | + did_emsg_syntax = FALSE; | |
| 51 | #ifdef FEAT_EVAL | |
| 52 | free_cmdlines(&lines_ga); | |
| 53 | ga_clear(&lines_ga); | |
| 54 | *************** | |
| 55 | *** 2137,2142 **** | |
| 56 | --- 2145,2151 ---- | |
| 57 | if (!sourcing) | |
| 58 | append_command(*cmdlinep); | |
| 59 | errormsg = IObuff; | |
| 60 | + did_emsg_syntax = TRUE; | |
| 61 | } | |
| 62 | goto doend; | |
| 63 | } | |
| 64 | *** ../vim-7.3.636/src/globals.h 2012-07-10 16:49:08.000000000 +0200 | |
| 65 | --- src/globals.h 2012-08-23 18:29:09.000000000 +0200 | |
| 66 | *************** | |
| 67 | *** 183,188 **** | |
| 68 | --- 183,190 ---- | |
| 69 | #endif | |
| 70 | EXTERN int did_emsg; /* set by emsg() when the message | |
| 71 | is displayed or thrown */ | |
| 72 | + EXTERN int did_emsg_syntax; /* did_emsg set because of a | |
| 73 | + syntax error */ | |
| 74 | EXTERN int called_emsg; /* always set by emsg() */ | |
| 75 | EXTERN int ex_exitval INIT(= 0); /* exit value for ex mode */ | |
| 76 | EXTERN int emsg_on_display INIT(= FALSE); /* there is an error message */ | |
| 77 | *** ../vim-7.3.636/src/version.c 2012-08-23 15:53:00.000000000 +0200 | |
| 78 | --- src/version.c 2012-08-23 17:59:12.000000000 +0200 | |
| 79 | *************** | |
| 80 | *** 721,722 **** | |
| 81 | --- 721,724 ---- | |
| 82 | { /* Add new patch number below this line */ | |
| 83 | + /**/ | |
| 84 | + 637, | |
| 85 | /**/ | |
| 86 | ||
| 87 | -- | |
| 88 | GOD: That is your purpose Arthur ... the Quest for the Holy Grail ... | |
| 89 | "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD | |
| 90 | ||
| 91 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 92 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 93 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
| 94 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |