projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| ef0610d1 AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.2.207 | |
| 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.2.207 | |
| 11 | Problem: Using freed memory with ":redrawstatus" when it works recursively. | |
| 12 | Solution: Prevent recursively updating the status line. (partly by Dominique | |
| 13 | Pelle) | |
| 14 | Files: src/screen.c | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-7.2.206/src/screen.c 2009-06-16 16:01:34.000000000 +0200 | |
| 18 | --- src/screen.c 2009-06-16 17:04:53.000000000 +0200 | |
| 19 | *************** | |
| 20 | *** 5743,5748 **** | |
| 21 | --- 5743,5755 ---- | |
| 22 | int fillchar; | |
| 23 | int attr; | |
| 24 | int this_ru_col; | |
| 25 | + static int busy = FALSE; | |
| 26 | + | |
| 27 | + /* It's possible to get here recursively when 'statusline' (indirectly) | |
| 28 | + * invokes ":redrawstatus". Simply ignore the call then. */ | |
| 29 | + if (busy) | |
| 30 | + return; | |
| 31 | + busy = TRUE; | |
| 32 | ||
| 33 | wp->w_redr_status = FALSE; | |
| 34 | if (wp->w_status_height == 0) | |
| 35 | *************** | |
| 36 | *** 5881,5886 **** | |
| 37 | --- 5888,5894 ---- | |
| 38 | attr); | |
| 39 | } | |
| 40 | #endif | |
| 41 | + busy = FALSE; | |
| 42 | } | |
| 43 | ||
| 44 | #ifdef FEAT_STL_OPT | |
| 45 | *** ../vim-7.2.206/src/version.c 2009-06-16 16:57:53.000000000 +0200 | |
| 46 | --- src/version.c 2009-06-16 17:21:56.000000000 +0200 | |
| 47 | *************** | |
| 48 | *** 678,679 **** | |
| 49 | --- 678,681 ---- | |
| 50 | { /* Add new patch number below this line */ | |
| 51 | + /**/ | |
| 52 | + 207, | |
| 53 | /**/ | |
| 54 | ||
| 55 | -- | |
| 56 | In many of the more relaxed civilizations on the Outer Eastern Rim of the | |
| 57 | Galaxy, "The Hitchhiker's Guide to the Galaxy" has already supplanted the | |
| 58 | great "Encyclopedia Galactica" as the standard repository of all knowledge | |
| 59 | and wisdom, for though it has many omissions and contains much that is | |
| 60 | apocryphal, or at least wildly inaccurate, it scores over the older, more | |
| 61 | pedestrian work in two important respects. | |
| 62 | First, it is slightly cheaper; and second, it has the words "DON'T PANIC" | |
| 63 | inscribed in large friendly letters on its cover. | |
| 64 | -- Douglas Adams, "The Hitchhiker's Guide to the Galaxy" | |
| 65 | ||
| 66 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 67 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 68 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 69 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |