projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 34eabb99 AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 6.2.284 | |
| 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.284 | |
| 11 | Problem: Listing a function puts "endfunction" in the message history. | |
| 12 | Typing "q" at the more prompt isn't handled correctly when listing | |
| 13 | variables and functions. (Hara Krishna Dara) | |
| 14 | Solution: Don't use msg() for "endfunction". Check "got_int" regularly. | |
| 15 | Files: src/eval.c | |
| 16 | ||
| 17 | ||
| 18 | *** ../vim-6.2.283/src/eval.c Thu Feb 19 15:31:20 2004 | |
| 19 | --- src/eval.c Fri Feb 20 20:23:16 2004 | |
| 20 | *************** | |
| 21 | *** 949,955 **** | |
| 22 | /* | |
| 23 | * List variables. | |
| 24 | */ | |
| 25 | ! while (!ends_excmd(*arg)) | |
| 26 | { | |
| 27 | char_u *temp_string = NULL; | |
| 28 | int arg_len; | |
| 29 | --- 949,955 ---- | |
| 30 | /* | |
| 31 | * List variables. | |
| 32 | */ | |
| 33 | ! while (!ends_excmd(*arg) && !got_int) | |
| 34 | { | |
| 35 | char_u *temp_string = NULL; | |
| 36 | int arg_len; | |
| 37 | *************** | |
| 38 | *** 8732,8744 **** | |
| 39 | eap->nextcmd = check_nextcmd(p); | |
| 40 | if (eap->nextcmd != NULL) | |
| 41 | *p = NUL; | |
| 42 | ! if (!eap->skip) | |
| 43 | { | |
| 44 | fp = find_func(name); | |
| 45 | if (fp != NULL) | |
| 46 | { | |
| 47 | list_func_head(fp, TRUE); | |
| 48 | ! for (j = 0; j < fp->lines.ga_len; ++j) | |
| 49 | { | |
| 50 | msg_putchar('\n'); | |
| 51 | msg_outnum((long)(j + 1)); | |
| 52 | --- 8733,8745 ---- | |
| 53 | eap->nextcmd = check_nextcmd(p); | |
| 54 | if (eap->nextcmd != NULL) | |
| 55 | *p = NUL; | |
| 56 | ! if (!eap->skip && !got_int) | |
| 57 | { | |
| 58 | fp = find_func(name); | |
| 59 | if (fp != NULL) | |
| 60 | { | |
| 61 | list_func_head(fp, TRUE); | |
| 62 | ! for (j = 0; j < fp->lines.ga_len && !got_int; ++j) | |
| 63 | { | |
| 64 | msg_putchar('\n'); | |
| 65 | msg_outnum((long)(j + 1)); | |
| 66 | *************** | |
| 67 | *** 8747,8754 **** | |
| 68 | if (j < 99) | |
| 69 | msg_putchar(' '); | |
| 70 | msg_prt_line(FUNCLINE(fp, j)); | |
| 71 | } | |
| 72 | - MSG(" endfunction"); | |
| 73 | } | |
| 74 | else | |
| 75 | EMSG2(_("E123: Undefined function: %s"), eap->arg); | |
| 76 | --- 8748,8761 ---- | |
| 77 | if (j < 99) | |
| 78 | msg_putchar(' '); | |
| 79 | msg_prt_line(FUNCLINE(fp, j)); | |
| 80 | + out_flush(); /* show a line at a time */ | |
| 81 | + ui_breakcheck(); | |
| 82 | + } | |
| 83 | + if (!got_int) | |
| 84 | + { | |
| 85 | + msg_putchar('\n'); | |
| 86 | + msg_puts((char_u *)" endfunction"); | |
| 87 | } | |
| 88 | } | |
| 89 | else | |
| 90 | EMSG2(_("E123: Undefined function: %s"), eap->arg); | |
| 91 | *** ../vim-6.2.283/src/version.c Fri Feb 20 22:08:18 2004 | |
| 92 | --- src/version.c Fri Feb 20 22:09:31 2004 | |
| 93 | *************** | |
| 94 | *** 639,640 **** | |
| 95 | --- 639,642 ---- | |
| 96 | { /* Add new patch number below this line */ | |
| 97 | + /**/ | |
| 98 | + 284, | |
| 99 | /**/ | |
| 100 | ||
| 101 | -- | |
| 102 | hundred-and-one symptoms of being an internet addict: | |
| 103 | 207. You're given one phone call in prison and you ask them for a laptop. | |
| 104 | ||
| 105 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 106 | /// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 107 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
| 108 | \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html /// |