projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| c84df032 ER |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.0.174 | |
| 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.174 | |
| 11 | Problem: ":mksession" doesn't restore window layout correctly in tab pages | |
| 12 | other than the current one. (Zhibin He) | |
| 13 | Solution: Use the correct topframe for producing the window layout commands. | |
| 14 | Files: src/ex_docmd.c | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-7.0.173/src/ex_docmd.c Tue Nov 14 20:24:32 2006 | |
| 18 | --- src/ex_docmd.c Tue Nov 28 21:32:41 2006 | |
| 19 | *************** | |
| 20 | *** 9675,9680 **** | |
| 21 | --- 9675,9681 ---- | |
| 22 | win_T *edited_win = NULL; | |
| 23 | int tabnr; | |
| 24 | win_T *tab_firstwin; | |
| 25 | + frame_T *tab_topframe; | |
| 26 | ||
| 27 | if (ssop_flags & SSOP_BUFFERS) | |
| 28 | only_save_windows = FALSE; /* Save ALL buffers */ | |
| 29 | *************** | |
| 30 | *** 9786,9791 **** | |
| 31 | --- 9787,9793 ---- | |
| 32 | * autocommands. | |
| 33 | */ | |
| 34 | tab_firstwin = firstwin; /* first window in tab page "tabnr" */ | |
| 35 | + tab_topframe = topframe; | |
| 36 | for (tabnr = 1; ; ++tabnr) | |
| 37 | { | |
| 38 | int need_tabnew = FALSE; | |
| 39 | *************** | |
| 40 | *** 9797,9805 **** | |
| 41 | --- 9799,9813 ---- | |
| 42 | if (tp == NULL) | |
| 43 | break; /* done all tab pages */ | |
| 44 | if (tp == curtab) | |
| 45 | + { | |
| 46 | tab_firstwin = firstwin; | |
| 47 | + tab_topframe = topframe; | |
| 48 | + } | |
| 49 | else | |
| 50 | + { | |
| 51 | tab_firstwin = tp->tp_firstwin; | |
| 52 | + tab_topframe = tp->tp_topframe; | |
| 53 | + } | |
| 54 | if (tabnr > 1) | |
| 55 | need_tabnew = TRUE; | |
| 56 | } | |
| 57 | *************** | |
| 58 | *** 9838,9844 **** | |
| 59 | */ | |
| 60 | if (put_line(fd, "set splitbelow splitright") == FAIL) | |
| 61 | return FAIL; | |
| 62 | ! if (ses_win_rec(fd, topframe) == FAIL) | |
| 63 | return FAIL; | |
| 64 | if (!p_sb && put_line(fd, "set nosplitbelow") == FAIL) | |
| 65 | return FAIL; | |
| 66 | --- 9846,9852 ---- | |
| 67 | */ | |
| 68 | if (put_line(fd, "set splitbelow splitright") == FAIL) | |
| 69 | return FAIL; | |
| 70 | ! if (ses_win_rec(fd, tab_topframe) == FAIL) | |
| 71 | return FAIL; | |
| 72 | if (!p_sb && put_line(fd, "set nosplitbelow") == FAIL) | |
| 73 | return FAIL; | |
| 74 | *** ../vim-7.0.173/src/version.c Tue Nov 28 20:54:32 2006 | |
| 75 | --- src/version.c Tue Nov 28 21:40:07 2006 | |
| 76 | *************** | |
| 77 | *** 668,669 **** | |
| 78 | --- 668,671 ---- | |
| 79 | { /* Add new patch number below this line */ | |
| 80 | + /**/ | |
| 81 | + 174, | |
| 82 | /**/ | |
| 83 | ||
| 84 | -- | |
| 85 | ARTHUR: Well, it doesn't matter. Will you go and tell your master that | |
| 86 | Arthur from the Court of Camelot is here. | |
| 87 | GUARD #1: Listen, in order to maintain air-speed velocity, a swallow | |
| 88 | needs to beat its wings 43 times every second, right? | |
| 89 | ARTHUR: Please! | |
| 90 | The Quest for the Holy Grail (Monty Python) | |
| 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 /// |