projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 34eabb99 AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 6.2.276 | |
| 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.276 | |
| 11 | Problem: ":echo X()" does not put a line break between the message that X() | |
| 12 | displays and the text that X() returns. (Yakov Lerner) | |
| 13 | Solution: Invoke msg_start() after evaluating the argument. | |
| 14 | Files: src/eval.c | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-6.2.275/src/eval.c Thu Feb 19 15:11:20 2004 | |
| 18 | --- src/eval.c Wed Feb 18 12:00:45 2004 | |
| 19 | *************** | |
| 20 | *** 8447,8454 **** | |
| 21 | ||
| 22 | if (eap->skip) | |
| 23 | ++emsg_skip; | |
| 24 | - else if (eap->cmdidx == CMD_echo) | |
| 25 | - msg_start(); | |
| 26 | while (*arg != NUL && *arg != '|' && *arg != '\n' && !got_int) | |
| 27 | { | |
| 28 | p = arg; | |
| 29 | --- 8447,8452 ---- | |
| 30 | *************** | |
| 31 | *** 8466,8472 **** | |
| 32 | --- 8464,8476 ---- | |
| 33 | if (!eap->skip) | |
| 34 | { | |
| 35 | if (atstart) | |
| 36 | + { | |
| 37 | atstart = FALSE; | |
| 38 | + /* Call msg_start() after eval1(), evaluating the expression | |
| 39 | + * may cause a message to appear. */ | |
| 40 | + if (eap->cmdidx == CMD_echo) | |
| 41 | + msg_start(); | |
| 42 | + } | |
| 43 | else if (eap->cmdidx == CMD_echo) | |
| 44 | msg_puts_attr((char_u *)" ", echo_attr); | |
| 45 | for (p = get_var_string(&retvar); *p != NUL && !got_int; ++p) | |
| 46 | *** ../vim-6.2.275/src/version.c Thu Feb 19 15:17:18 2004 | |
| 47 | --- src/version.c Thu Feb 19 15:18:35 2004 | |
| 48 | *************** | |
| 49 | *** 639,640 **** | |
| 50 | --- 639,642 ---- | |
| 51 | { /* Add new patch number below this line */ | |
| 52 | + /**/ | |
| 53 | + 276, | |
| 54 | /**/ | |
| 55 | ||
| 56 | -- | |
| 57 | A computer program does what you tell it to do, not what you want it to do. | |
| 58 | ||
| 59 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 60 | /// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 61 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
| 62 | \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html /// |