projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 8bb52fd3 ER |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.587 | |
| 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.587 | |
| 11 | Problem: Compiler warning for local var shadowing global var. | |
| 12 | Solution: Rename the var and move it to an inner block. (Christian Brabandt) | |
| 13 | Files: src/buffer.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.3.586/src/buffer.c 2012-06-20 17:54:34.000000000 +0200 | |
| 17 | --- src/buffer.c 2012-07-06 16:19:32.000000000 +0200 | |
| 18 | *************** | |
| 19 | *** 1363,1371 **** | |
| 20 | int action; | |
| 21 | { | |
| 22 | buf_T *prevbuf; | |
| 23 | - #ifdef FEAT_WINDOWS | |
| 24 | - win_T *prevwin; | |
| 25 | - #endif | |
| 26 | int unload = (action == DOBUF_UNLOAD || action == DOBUF_DEL | |
| 27 | || action == DOBUF_WIPE); | |
| 28 | ||
| 29 | --- 1363,1368 ---- | |
| 30 | *************** | |
| 31 | *** 1406,1412 **** | |
| 32 | #endif | |
| 33 | { | |
| 34 | #ifdef FEAT_WINDOWS | |
| 35 | ! prevwin = curwin; | |
| 36 | #endif | |
| 37 | if (prevbuf == curbuf) | |
| 38 | u_sync(FALSE); | |
| 39 | --- 1403,1409 ---- | |
| 40 | #endif | |
| 41 | { | |
| 42 | #ifdef FEAT_WINDOWS | |
| 43 | ! win_T *previouswin = curwin; | |
| 44 | #endif | |
| 45 | if (prevbuf == curbuf) | |
| 46 | u_sync(FALSE); | |
| 47 | *************** | |
| 48 | *** 1415,1423 **** | |
| 49 | && !P_HID(prevbuf) | |
| 50 | && !bufIsChanged(prevbuf)) ? DOBUF_UNLOAD : 0, FALSE); | |
| 51 | #ifdef FEAT_WINDOWS | |
| 52 | ! if (curwin != prevwin && win_valid(prevwin)) | |
| 53 | /* autocommands changed curwin, Grr! */ | |
| 54 | ! curwin = prevwin; | |
| 55 | #endif | |
| 56 | } | |
| 57 | } | |
| 58 | --- 1412,1420 ---- | |
| 59 | && !P_HID(prevbuf) | |
| 60 | && !bufIsChanged(prevbuf)) ? DOBUF_UNLOAD : 0, FALSE); | |
| 61 | #ifdef FEAT_WINDOWS | |
| 62 | ! if (curwin != previouswin && win_valid(previouswin)) | |
| 63 | /* autocommands changed curwin, Grr! */ | |
| 64 | ! curwin = previouswin; | |
| 65 | #endif | |
| 66 | } | |
| 67 | } | |
| 68 | *** ../vim-7.3.586/src/version.c 2012-07-06 13:40:44.000000000 +0200 | |
| 69 | --- src/version.c 2012-07-06 16:19:08.000000000 +0200 | |
| 70 | *************** | |
| 71 | *** 716,717 **** | |
| 72 | --- 716,719 ---- | |
| 73 | { /* Add new patch number below this line */ | |
| 74 | + /**/ | |
| 75 | + 587, | |
| 76 | /**/ | |
| 77 | ||
| 78 | -- | |
| 79 | There's no place like $(HOME)! | |
| 80 | ||
| 81 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 82 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 83 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
| 84 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |