projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 05b5d6bc AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 6.2.340 | |
| 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.340 | |
| 11 | Problem: ":reg" doesn't show the actual contents of the clipboard if it was | |
| 12 | filled outside of Vim. (Stuart MacDonald) | |
| 13 | Solution: Obtain the clipboard contents before displaying it. | |
| 14 | Files: src/ops.c | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-6.2.339/src/ops.c Tue Mar 9 19:49:08 2004 | |
| 18 | --- src/ops.c Thu Mar 11 17:40:10 2004 | |
| 19 | *************** | |
| 20 | *** 3649,3655 **** | |
| 21 | long j; | |
| 22 | char_u *p; | |
| 23 | struct yankreg *yb; | |
| 24 | ! char_u name; | |
| 25 | int attr; | |
| 26 | char_u *arg = eap->arg; | |
| 27 | ||
| 28 | --- 3649,3655 ---- | |
| 29 | long j; | |
| 30 | char_u *p; | |
| 31 | struct yankreg *yb; | |
| 32 | ! int name; | |
| 33 | int attr; | |
| 34 | char_u *arg = eap->arg; | |
| 35 | ||
| 36 | *************** | |
| 37 | *** 3661,3666 **** | |
| 38 | --- 3661,3678 ---- | |
| 39 | MSG_PUTS_TITLE(_("\n--- Registers ---")); | |
| 40 | for (i = -1; i < NUM_REGISTERS && !got_int; ++i) | |
| 41 | { | |
| 42 | + name = get_register_name(i); | |
| 43 | + if (arg != NULL && vim_strchr(arg, name) == NULL) | |
| 44 | + continue; /* did not ask for this register */ | |
| 45 | + | |
| 46 | + #ifdef FEAT_CLIPBOARD | |
| 47 | + /* Adjust register name for "unnamed" in 'clipboard'. | |
| 48 | + * When it's a clipboard register, fill it with the current contents | |
| 49 | + * of the clipboard. */ | |
| 50 | + adjust_clip_reg(&name); | |
| 51 | + (void)may_get_selection(name); | |
| 52 | + #endif | |
| 53 | + | |
| 54 | if (i == -1) | |
| 55 | { | |
| 56 | if (y_previous != NULL) | |
| 57 | *************** | |
| 58 | *** 3670,3678 **** | |
| 59 | } | |
| 60 | else | |
| 61 | yb = &(y_regs[i]); | |
| 62 | ! name = get_register_name(i); | |
| 63 | ! if (yb->y_array != NULL | |
| 64 | ! && (arg == NULL || vim_strchr(arg, name) != NULL)) | |
| 65 | { | |
| 66 | msg_putchar('\n'); | |
| 67 | msg_putchar('"'); | |
| 68 | --- 3682,3688 ---- | |
| 69 | } | |
| 70 | else | |
| 71 | yb = &(y_regs[i]); | |
| 72 | ! if (yb->y_array != NULL) | |
| 73 | { | |
| 74 | msg_putchar('\n'); | |
| 75 | msg_putchar('"'); | |
| 76 | *** ../vim-6.2.339/src/version.c Wed Mar 10 16:22:45 2004 | |
| 77 | --- src/version.c Thu Mar 11 17:47:28 2004 | |
| 78 | *************** | |
| 79 | *** 639,640 **** | |
| 80 | --- 639,642 ---- | |
| 81 | { /* Add new patch number below this line */ | |
| 82 | + /**/ | |
| 83 | + 340, | |
| 84 | /**/ | |
| 85 | ||
| 86 | -- | |
| 87 | login: yes | |
| 88 | password: I don't know, please tell me | |
| 89 | password is incorrect | |
| 90 | login: yes | |
| 91 | password: incorrect | |
| 92 | ||
| 93 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 94 | /// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 95 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
| 96 | \\\ Buy at Amazon and help AIDS victims -- http://ICCF.nl/click1.html /// |