diff options
author | Florian Pritz <bluewind@xssn.at> | 2011-07-24 12:07:51 +0200 |
---|---|---|
committer | Florian Pritz <bluewind@xssn.at> | 2011-07-24 12:07:51 +0200 |
commit | b8c33ee22e78f48f52bfde7328d20efe73493149 (patch) | |
tree | af5a3a56a5094facb1c00472c0b1a3be7478eca2 /gvim/vim-7.2/7.2.342 | |
parent | 9c7f68c9ab1ed52a5c4c2cec57c71b15d2209f52 (diff) | |
parent | 34e8f8d7edc734b88753ff7cb0443f8489b02ee8 (diff) | |
download | aur-packages-b8c33ee22e78f48f52bfde7328d20efe73493149.tar.gz aur-packages-b8c33ee22e78f48f52bfde7328d20efe73493149.tar.xz |
Merge branch 'master' of git://git.server-speed.net/~flo/git/aur
Diffstat (limited to 'gvim/vim-7.2/7.2.342')
-rw-r--r-- | gvim/vim-7.2/7.2.342 | 95 |
1 files changed, 0 insertions, 95 deletions
diff --git a/gvim/vim-7.2/7.2.342 b/gvim/vim-7.2/7.2.342 deleted file mode 100644 index 72bf253..0000000 --- a/gvim/vim-7.2/7.2.342 +++ /dev/null @@ -1,95 +0,0 @@ -To: vim-dev@vim.org -Subject: Patch 7.2.342 -Fcc: outbox -From: Bram Moolenaar <Bram@moolenaar.net> -Mime-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.2.342 -Problem: Popup menu displayed wrong in 'rightleft' mode when there are - multi-byte characters. -Solution: Adjust the column computations. (Dominique Pelle) -Files: src/popupmnu.c - - -*** ../vim-7.2.341/src/popupmnu.c 2008-11-15 14:10:23.000000000 +0100 ---- src/popupmnu.c 2010-01-19 17:57:05.000000000 +0100 -*************** -*** 345,365 **** - if (st != NULL) - { - char_u *rt = reverse_text(st); -- char_u *rt_saved = rt; -- int len, j; - - if (rt != NULL) - { -! len = (int)STRLEN(rt); -! if (len > pum_width) - { -! for (j = pum_width; j < len; ++j) - mb_ptr_adv(rt); -! len = pum_width; - } -! screen_puts_len(rt, len, row, -! col - len + 1, attr); -! vim_free(rt_saved); - } - vim_free(st); - } ---- 345,380 ---- - if (st != NULL) - { - char_u *rt = reverse_text(st); - - if (rt != NULL) - { -! char_u *rt_start = rt; -! int size; -! -! size = vim_strsize(rt); -! if (size > pum_width) - { -! do -! { -! size -= has_mbyte -! ? (*mb_ptr2cells)(rt) : 1; - mb_ptr_adv(rt); -! } while (size > pum_width); -! -! if (size < pum_width) -! { -! /* Most left character requires -! * 2-cells but only 1 cell is -! * available on screen. Put a -! * '<' on the left of the pum -! * item */ -! *(--rt) = '<'; -! size++; -! } - } -! screen_puts_len(rt, (int)STRLEN(rt), -! row, col - size + 1, attr); -! vim_free(rt_start); - } - vim_free(st); - } -*** ../vim-7.2.341/src/version.c 2010-01-19 17:40:39.000000000 +0100 ---- src/version.c 2010-01-19 18:03:22.000000000 +0100 -*************** -*** 683,684 **** ---- 683,686 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 342, - /**/ - --- -I have a watch cat! Just break in and she'll watch. - - /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |