projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 39a54fe5 AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.2.220 | |
| 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.220 (after 7.2.215) | |
| 11 | Problem: a BufEnter autocommand that changes directory causes problems. | |
| 12 | (Ajit Thakkar) | |
| 13 | Solution: Disable autocommands when opening a hidden buffer in a window. | |
| 14 | Files: src/fileio.c | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-7.2.219/src/fileio.c 2009-06-24 17:31:27.000000000 +0200 | |
| 18 | --- src/fileio.c 2009-07-01 17:02:46.000000000 +0200 | |
| 19 | *************** | |
| 20 | *** 8441,8453 **** | |
| 21 | win_init_empty(aucmd_win); /* set cursor and topline to safe values */ | |
| 22 | ||
| 23 | #ifdef FEAT_WINDOWS | |
| 24 | ! /* Split the current window, put the aucmd_win in the upper half. */ | |
| 25 | make_snapshot(SNAP_AUCMD_IDX); | |
| 26 | save_ea = p_ea; | |
| 27 | p_ea = FALSE; | |
| 28 | (void)win_split_ins(0, WSP_TOP, aucmd_win, 0); | |
| 29 | (void)win_comp_pos(); /* recompute window positions */ | |
| 30 | p_ea = save_ea; | |
| 31 | #endif | |
| 32 | curwin = aucmd_win; | |
| 33 | } | |
| 34 | --- 8441,8456 ---- | |
| 35 | win_init_empty(aucmd_win); /* set cursor and topline to safe values */ | |
| 36 | ||
| 37 | #ifdef FEAT_WINDOWS | |
| 38 | ! /* Split the current window, put the aucmd_win in the upper half. | |
| 39 | ! * We don't want the BufEnter or WinEnter autocommands. */ | |
| 40 | ! block_autocmds(); | |
| 41 | make_snapshot(SNAP_AUCMD_IDX); | |
| 42 | save_ea = p_ea; | |
| 43 | p_ea = FALSE; | |
| 44 | (void)win_split_ins(0, WSP_TOP, aucmd_win, 0); | |
| 45 | (void)win_comp_pos(); /* recompute window positions */ | |
| 46 | p_ea = save_ea; | |
| 47 | + unblock_autocmds(); | |
| 48 | #endif | |
| 49 | curwin = aucmd_win; | |
| 50 | } | |
| 51 | *************** | |
| 52 | *** 8474,8480 **** | |
| 53 | --curbuf->b_nwindows; | |
| 54 | #ifdef FEAT_WINDOWS | |
| 55 | /* Find "aucmd_win", it can't be closed, but it may be in another tab | |
| 56 | ! * page. */ | |
| 57 | if (curwin != aucmd_win) | |
| 58 | { | |
| 59 | tabpage_T *tp; | |
| 60 | --- 8477,8484 ---- | |
| 61 | --curbuf->b_nwindows; | |
| 62 | #ifdef FEAT_WINDOWS | |
| 63 | /* Find "aucmd_win", it can't be closed, but it may be in another tab | |
| 64 | ! * page. Do not trigger autocommands here. */ | |
| 65 | ! block_autocmds(); | |
| 66 | if (curwin != aucmd_win) | |
| 67 | { | |
| 68 | tabpage_T *tp; | |
| 69 | *************** | |
| 70 | *** 8498,8503 **** | |
| 71 | --- 8502,8508 ---- | |
| 72 | last_status(FALSE); /* may need to remove last status line */ | |
| 73 | restore_snapshot(SNAP_AUCMD_IDX, FALSE); | |
| 74 | (void)win_comp_pos(); /* recompute window positions */ | |
| 75 | + unblock_autocmds(); | |
| 76 | ||
| 77 | if (win_valid(aco->save_curwin)) | |
| 78 | curwin = aco->save_curwin; | |
| 79 | *** ../vim-7.2.219/src/version.c 2009-07-01 16:12:54.000000000 +0200 | |
| 80 | --- src/version.c 2009-07-01 17:10:22.000000000 +0200 | |
| 81 | *************** | |
| 82 | *** 678,679 **** | |
| 83 | --- 678,681 ---- | |
| 84 | { /* Add new patch number below this line */ | |
| 85 | + /**/ | |
| 86 | + 220, | |
| 87 | /**/ | |
| 88 | ||
| 89 | -- | |
| 90 | Microsoft is to software what McDonalds is to gourmet cooking | |
| 91 | ||
| 92 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 93 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 94 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 95 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |