projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 9512a71a AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.2.117 | |
| 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.2.117 | |
| 11 | Problem: Location list incorrectly labelled "Quickfix List". | |
| 12 | Solution: Break out of both loops for finding window for location list | |
| 13 | buffer. (Lech Lorens) | |
| 14 | Files: src/buffer.c, src/quickfix.c, src/screen.c | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-7.2.116/src/buffer.c Tue Jan 6 16:13:42 2009 | |
| 18 | --- src/buffer.c Tue Feb 17 04:00:51 2009 | |
| 19 | *************** | |
| 20 | *** 5098,5104 **** | |
| 21 | */ | |
| 22 | FOR_ALL_TAB_WINDOWS(tp, win) | |
| 23 | if (win->w_buffer == buf) | |
| 24 | ! break; | |
| 25 | if (win != NULL && win->w_llist_ref != NULL) | |
| 26 | return _("[Location List]"); | |
| 27 | else | |
| 28 | --- 5098,5105 ---- | |
| 29 | */ | |
| 30 | FOR_ALL_TAB_WINDOWS(tp, win) | |
| 31 | if (win->w_buffer == buf) | |
| 32 | ! goto win_found; | |
| 33 | ! win_found: | |
| 34 | if (win != NULL && win->w_llist_ref != NULL) | |
| 35 | return _("[Location List]"); | |
| 36 | else | |
| 37 | *** ../vim-7.2.116/src/quickfix.c Sat Nov 15 14:10:23 2008 | |
| 38 | --- src/quickfix.c Sat Feb 21 22:54:25 2009 | |
| 39 | *************** | |
| 40 | *** 1610,1619 **** | |
| 41 | { | |
| 42 | goto_tabpage_win(tp, wp); | |
| 43 | usable_win = 1; | |
| 44 | ! break; | |
| 45 | } | |
| 46 | } | |
| 47 | } | |
| 48 | ||
| 49 | /* | |
| 50 | * If there is only one window and it is the quickfix window, create a | |
| 51 | --- 1612,1622 ---- | |
| 52 | { | |
| 53 | goto_tabpage_win(tp, wp); | |
| 54 | usable_win = 1; | |
| 55 | ! goto win_found; | |
| 56 | } | |
| 57 | } | |
| 58 | } | |
| 59 | + win_found: | |
| 60 | ||
| 61 | /* | |
| 62 | * If there is only one window and it is the quickfix window, create a | |
| 63 | *** ../vim-7.2.116/src/screen.c Sat Feb 21 21:22:44 2009 | |
| 64 | --- src/screen.c Sat Feb 21 21:04:19 2009 | |
| 65 | *************** | |
| 66 | *** 7452,7461 **** | |
| 67 | { | |
| 68 | outofmem = TRUE; | |
| 69 | #ifdef FEAT_WINDOWS | |
| 70 | ! break; | |
| 71 | #endif | |
| 72 | } | |
| 73 | } | |
| 74 | ||
| 75 | #ifdef FEAT_MBYTE | |
| 76 | for (i = 0; i < p_mco; ++i) | |
| 77 | --- 7452,7464 ---- | |
| 78 | { | |
| 79 | outofmem = TRUE; | |
| 80 | #ifdef FEAT_WINDOWS | |
| 81 | ! goto give_up; | |
| 82 | #endif | |
| 83 | } | |
| 84 | } | |
| 85 | + #ifdef FEAT_WINDOWS | |
| 86 | + give_up: | |
| 87 | + #endif | |
| 88 | ||
| 89 | #ifdef FEAT_MBYTE | |
| 90 | for (i = 0; i < p_mco; ++i) | |
| 91 | *** ../vim-7.2.116/src/version.c Sat Feb 21 22:57:10 2009 | |
| 92 | --- src/version.c Sat Feb 21 23:58:24 2009 | |
| 93 | *************** | |
| 94 | *** 678,679 **** | |
| 95 | --- 678,681 ---- | |
| 96 | { /* Add new patch number below this line */ | |
| 97 | + /**/ | |
| 98 | + 117, | |
| 99 | /**/ | |
| 100 | ||
| 101 | -- | |
| 102 | Laughing helps. It's like jogging on the inside. | |
| 103 | ||
| 104 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 105 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 106 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 107 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |