|
 |
89d01c1 |
To: vim-dev@vim.org
|
|
|
89d01c1 |
Subject: Patch 7.2.342
|
|
|
89d01c1 |
Fcc: outbox
|
|
|
89d01c1 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
89d01c1 |
Mime-Version: 1.0
|
|
|
89d01c1 |
Content-Type: text/plain; charset=UTF-8
|
|
|
89d01c1 |
Content-Transfer-Encoding: 8bit
|
|
|
89d01c1 |
------------
|
|
|
89d01c1 |
|
|
|
89d01c1 |
Patch 7.2.342
|
|
|
89d01c1 |
Problem: Popup menu displayed wrong in 'rightleft' mode when there are
|
|
|
89d01c1 |
multi-byte characters.
|
|
|
89d01c1 |
Solution: Adjust the column computations. (Dominique Pelle)
|
|
|
89d01c1 |
Files: src/popupmnu.c
|
|
|
89d01c1 |
|
|
|
89d01c1 |
|
|
|
89d01c1 |
*** ../vim-7.2.341/src/popupmnu.c 2008-11-15 14:10:23.000000000 +0100
|
|
|
89d01c1 |
--- src/popupmnu.c 2010-01-19 17:57:05.000000000 +0100
|
|
|
89d01c1 |
***************
|
|
|
89d01c1 |
*** 345,365 ****
|
|
|
89d01c1 |
if (st != NULL)
|
|
|
89d01c1 |
{
|
|
|
89d01c1 |
char_u *rt = reverse_text(st);
|
|
|
89d01c1 |
- char_u *rt_saved = rt;
|
|
|
89d01c1 |
- int len, j;
|
|
|
89d01c1 |
|
|
|
89d01c1 |
if (rt != NULL)
|
|
|
89d01c1 |
{
|
|
|
89d01c1 |
! len = (int)STRLEN(rt);
|
|
|
89d01c1 |
! if (len > pum_width)
|
|
|
89d01c1 |
{
|
|
|
89d01c1 |
! for (j = pum_width; j < len; ++j)
|
|
|
89d01c1 |
mb_ptr_adv(rt);
|
|
|
89d01c1 |
! len = pum_width;
|
|
|
89d01c1 |
}
|
|
|
89d01c1 |
! screen_puts_len(rt, len, row,
|
|
|
89d01c1 |
! col - len + 1, attr);
|
|
|
89d01c1 |
! vim_free(rt_saved);
|
|
|
89d01c1 |
}
|
|
|
89d01c1 |
vim_free(st);
|
|
|
89d01c1 |
}
|
|
|
89d01c1 |
--- 345,380 ----
|
|
|
89d01c1 |
if (st != NULL)
|
|
|
89d01c1 |
{
|
|
|
89d01c1 |
char_u *rt = reverse_text(st);
|
|
|
89d01c1 |
|
|
|
89d01c1 |
if (rt != NULL)
|
|
|
89d01c1 |
{
|
|
|
89d01c1 |
! char_u *rt_start = rt;
|
|
|
89d01c1 |
! int size;
|
|
|
89d01c1 |
!
|
|
|
89d01c1 |
! size = vim_strsize(rt);
|
|
|
89d01c1 |
! if (size > pum_width)
|
|
|
89d01c1 |
{
|
|
|
89d01c1 |
! do
|
|
|
89d01c1 |
! {
|
|
|
89d01c1 |
! size -= has_mbyte
|
|
|
89d01c1 |
! ? (*mb_ptr2cells)(rt) : 1;
|
|
|
89d01c1 |
mb_ptr_adv(rt);
|
|
|
89d01c1 |
! } while (size > pum_width);
|
|
|
89d01c1 |
!
|
|
|
89d01c1 |
! if (size < pum_width)
|
|
|
89d01c1 |
! {
|
|
|
89d01c1 |
! /* Most left character requires
|
|
|
89d01c1 |
! * 2-cells but only 1 cell is
|
|
|
89d01c1 |
! * available on screen. Put a
|
|
|
89d01c1 |
! * '<' on the left of the pum
|
|
|
89d01c1 |
! * item */
|
|
|
89d01c1 |
! *(--rt) = '<';
|
|
|
89d01c1 |
! size++;
|
|
|
89d01c1 |
! }
|
|
|
89d01c1 |
}
|
|
|
89d01c1 |
! screen_puts_len(rt, (int)STRLEN(rt),
|
|
|
89d01c1 |
! row, col - size + 1, attr);
|
|
|
89d01c1 |
! vim_free(rt_start);
|
|
|
89d01c1 |
}
|
|
|
89d01c1 |
vim_free(st);
|
|
|
89d01c1 |
}
|
|
|
89d01c1 |
*** ../vim-7.2.341/src/version.c 2010-01-19 17:40:39.000000000 +0100
|
|
|
89d01c1 |
--- src/version.c 2010-01-19 18:03:22.000000000 +0100
|
|
|
89d01c1 |
***************
|
|
|
89d01c1 |
*** 683,684 ****
|
|
|
89d01c1 |
--- 683,686 ----
|
|
|
89d01c1 |
{ /* Add new patch number below this line */
|
|
|
89d01c1 |
+ /**/
|
|
|
89d01c1 |
+ 342,
|
|
|
89d01c1 |
/**/
|
|
|
89d01c1 |
|
|
|
89d01c1 |
--
|
|
|
89d01c1 |
I have a watch cat! Just break in and she'll watch.
|
|
|
89d01c1 |
|
|
|
89d01c1 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
89d01c1 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
89d01c1 |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
89d01c1 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|