projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| eb0ac1ae AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 6.2.151 | |
| 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.151 | |
| 11 | Problem: When doing "vim --remote +startinsert file" some commands are | |
| 12 | inserted as text. (Klaus Bosau) | |
| 13 | Solution: Put all the init commands in one Ex line, not using a <CR>, so | |
| 14 | that Insert mode isn't started too early. | |
| 15 | Files: src/main.c | |
| 16 | ||
| 17 | ||
| 18 | *** ../vim-6.2.150/src/main.c Thu Sep 11 21:25:43 2003 | |
| 19 | --- src/main.c Mon Nov 10 10:47:31 2003 | |
| 20 | *************** | |
| 21 | *** 3014,3027 **** | |
| 22 | ga_concat(&ga, (char_u *)"<C-\\><C-N>:cd -"); | |
| 23 | if (sendReply) | |
| 24 | ga_concat(&ga, (char_u *)"<CR>:call SetupRemoteReplies()"); | |
| 25 | if (inicmd != NULL) | |
| 26 | { | |
| 27 | ! ga_concat(&ga, (char_u *)"<CR>:"); | |
| 28 | ga_concat(&ga, inicmd); | |
| 29 | } | |
| 30 | /* Bring the window to the foreground, goto Insert mode when 'im' set and | |
| 31 | ! * clear command line */ | |
| 32 | ! ga_concat(&ga, (char_u *)"<CR>:call foreground()<CR>:if &im|starti|endif|echo<CR>"); | |
| 33 | ga_append(&ga, NUL); | |
| 34 | return ga.ga_data; | |
| 35 | } | |
| 36 | --- 3022,3039 ---- | |
| 37 | ga_concat(&ga, (char_u *)"<C-\\><C-N>:cd -"); | |
| 38 | if (sendReply) | |
| 39 | ga_concat(&ga, (char_u *)"<CR>:call SetupRemoteReplies()"); | |
| 40 | + ga_concat(&ga, (char_u *)"<CR>:"); | |
| 41 | if (inicmd != NULL) | |
| 42 | { | |
| 43 | ! /* Can't use <CR> after "inicmd", because an "startinsert" would cause | |
| 44 | ! * the following commands to be inserted as text. Use a "|", | |
| 45 | ! * hopefully "inicmd" does allow this... */ | |
| 46 | ga_concat(&ga, inicmd); | |
| 47 | + ga_concat(&ga, (char_u *)"|"); | |
| 48 | } | |
| 49 | /* Bring the window to the foreground, goto Insert mode when 'im' set and | |
| 50 | ! * clear command line. */ | |
| 51 | ! ga_concat(&ga, (char_u *)"cal foreground()|if &im|star|en|ec<CR>"); | |
| 52 | ga_append(&ga, NUL); | |
| 53 | return ga.ga_data; | |
| 54 | } | |
| 55 | *** ../vim-6.2.150/src/version.c Wed Nov 12 20:41:45 2003 | |
| 56 | --- src/version.c Wed Nov 12 20:43:34 2003 | |
| 57 | *************** | |
| 58 | *** 639,640 **** | |
| 59 | --- 639,642 ---- | |
| 60 | { /* Add new patch number below this line */ | |
| 61 | + /**/ | |
| 62 | + 151, | |
| 63 | /**/ | |
| 64 | ||
| 65 | -- | |
| 66 | The goal of science is to build better mousetraps. | |
| 67 | The goal of nature is to build better mice. | |
| 68 | ||
| 69 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 70 | /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ | |
| 71 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
| 72 | \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html /// |