projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 717fd8f6 AF |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 6.2.091 | |
| 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 6.2.091 | |
| 11 | Problem: When an autocommand is triggered when a file is dropped on Vim and | |
| 12 | it produces output, messages from a following command may be | |
| 13 | scrolled unexpectedly. (David Rennalls) | |
| 14 | Solution: Save and restore msg_scroll in handle_drop(). | |
| 15 | Files: src/ex_docmd.c | |
| 16 | ||
| 17 | ||
| 18 | *** ../vim-6.2.090/src/ex_docmd.c Wed Sep 10 22:41:46 2003 | |
| 19 | --- src/ex_docmd.c Sun Sep 7 14:26:29 2003 | |
| 20 | *************** | |
| 21 | *** 5682,5692 **** | |
| 22 | int split; /* force splitting the window */ | |
| 23 | { | |
| 24 | exarg_T ea; | |
| 25 | ||
| 26 | ! #ifdef FEAT_CMDWIN | |
| 27 | if (cmdwin_type != 0) | |
| 28 | return; | |
| 29 | ! #endif | |
| 30 | ||
| 31 | /* Check whether the current buffer is changed. If so, we will need | |
| 32 | * to split the current window or data could be lost. | |
| 33 | --- 5684,5695 ---- | |
| 34 | int split; /* force splitting the window */ | |
| 35 | { | |
| 36 | exarg_T ea; | |
| 37 | + int save_msg_scroll = msg_scroll; | |
| 38 | ||
| 39 | ! # ifdef FEAT_CMDWIN | |
| 40 | if (cmdwin_type != 0) | |
| 41 | return; | |
| 42 | ! # endif | |
| 43 | ||
| 44 | /* Check whether the current buffer is changed. If so, we will need | |
| 45 | * to split the current window or data could be lost. | |
| 46 | *************** | |
| 47 | *** 5735,5740 **** | |
| 48 | --- 5742,5752 ---- | |
| 49 | /* do_ecmd() may set need_start_insertmode, but since we never left Insert | |
| 50 | * mode that is not needed here. */ | |
| 51 | need_start_insertmode = FALSE; | |
| 52 | + | |
| 53 | + /* Restore msg_scroll, otherwise a following command may cause scrolling | |
| 54 | + * unexpectedly. The screen will be redrawn by the caller, thus | |
| 55 | + * msg_scroll being set by displaying a message is irrelevant. */ | |
| 56 | + msg_scroll = save_msg_scroll; | |
| 57 | } | |
| 58 | #endif | |
| 59 | ||
| 60 | *** ../vim-6.2.090/src/version.c Thu Sep 11 21:50:44 2003 | |
| 61 | --- src/version.c Fri Sep 12 19:49:12 2003 | |
| 62 | *************** | |
| 63 | *** 632,633 **** | |
| 64 | --- 632,635 ---- | |
| 65 | { /* Add new patch number below this line */ | |
| 66 | + /**/ | |
| 67 | + 91, | |
| 68 | /**/ | |
| 69 | ||
| 70 | -- | |
| 71 | Why is "abbreviation" such a long word? | |
| 72 | ||
| 73 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 74 | /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ | |
| 75 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
| 76 | \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html /// |