home *** CD-ROM | disk | FTP | other *** search
/ vim.ftp.fu-berlin.de / 2015-02-03.vim.ftp.fu-berlin.de.tar / vim.ftp.fu-berlin.de / patches / 7.3 / 7.3.695 < prev    next >
Encoding:
Internet Message Format  |  2012-11-20  |  3.6 KB
  1. To: vim_dev@googlegroups.com
  2. Subject: Patch 7.3.695
  3. Fcc: outbox
  4. From: Bram Moolenaar <Bram@moolenaar.net>
  5. Mime-Version: 1.0
  6. Content-Type: text/plain; charset=UTF-8
  7. Content-Transfer-Encoding: 8bit
  8. ------------
  9.  
  10. Patch 7.3.695
  11. Problem:    Balloon cannot show multi-byte text.
  12. Solution:   Properly deal with multi-byte characters. (Dominique Pelle)
  13. Files:      src/gui_beval.c, src/ui.c
  14.  
  15.  
  16. *** ../vim-7.3.694/src/gui_beval.c    2010-08-15 21:57:28.000000000 +0200
  17. --- src/gui_beval.c    2012-10-21 00:54:19.000000000 +0200
  18. ***************
  19. *** 359,365 ****
  20.               }
  21.               }
  22.   
  23. !             col = vcol2col(wp, lnum, col) - 1;
  24.   
  25.               if (VIsual_active
  26.                   && wp->w_buffer == curwin->w_buffer
  27. --- 359,365 ----
  28.               }
  29.               }
  30.   
  31. !             col = vcol2col(wp, lnum, col);
  32.   
  33.               if (VIsual_active
  34.                   && wp->w_buffer == curwin->w_buffer
  35. ***************
  36. *** 377,384 ****
  37.                   return FAIL;
  38.   
  39.               lbuf = ml_get_buf(curwin->w_buffer, VIsual.lnum, FALSE);
  40. !             lbuf = vim_strnsave(lbuf + spos->col,
  41. !                      epos->col - spos->col + (*p_sel != 'e'));
  42.               lnum = spos->lnum;
  43.               col = spos->col;
  44.               }
  45. --- 377,386 ----
  46.                   return FAIL;
  47.   
  48.               lbuf = ml_get_buf(curwin->w_buffer, VIsual.lnum, FALSE);
  49. !             len = epos->col - spos->col;
  50. !             if (*p_sel != 'e')
  51. !                 len += MB_PTR2LEN(lbuf + epos->col);
  52. !             lbuf = vim_strnsave(lbuf + spos->col, len);
  53.               lnum = spos->lnum;
  54.               col = spos->col;
  55.               }
  56. *** ../vim-7.3.694/src/ui.c    2012-08-29 16:26:01.000000000 +0200
  57. --- src/ui.c    2012-10-21 00:50:17.000000000 +0200
  58. ***************
  59. *** 98,104 ****
  60.   #endif
  61.   
  62.   /*
  63. !  * ui_inchar(): low level input funcion.
  64.    * Get characters from the keyboard.
  65.    * Return the number of characters that are available.
  66.    * If "wtime" == 0 do not wait for characters.
  67. --- 98,104 ----
  68.   #endif
  69.   
  70.   /*
  71. !  * ui_inchar(): low level input function.
  72.    * Get characters from the keyboard.
  73.    * Return the number of characters that are available.
  74.    * If "wtime" == 0 do not wait for characters.
  75. ***************
  76. *** 493,499 ****
  77.       }
  78.       }
  79.   #else
  80. !     /* Only own the clibpard when we didn't own it yet. */
  81.       if (!cbd->owned && cbd->available)
  82.       cbd->owned = (clip_gen_own_selection(cbd) == OK);
  83.   #endif
  84. --- 493,499 ----
  85.       }
  86.       }
  87.   #else
  88. !     /* Only own the clipboard when we didn't own it yet. */
  89.       if (!cbd->owned && cbd->available)
  90.       cbd->owned = (clip_gen_own_selection(cbd) == OK);
  91.   #endif
  92. ***************
  93. *** 3132,3138 ****
  94.       char_u    *start;
  95.   
  96.       start = ptr = ml_get_buf(wp->w_buffer, lnum, FALSE);
  97. !     while (count <= vcol && *ptr != NUL)
  98.       {
  99.       count += win_lbr_chartabsize(wp, ptr, count, NULL);
  100.       mb_ptr_adv(ptr);
  101. --- 3132,3138 ----
  102.       char_u    *start;
  103.   
  104.       start = ptr = ml_get_buf(wp->w_buffer, lnum, FALSE);
  105. !     while (count < vcol && *ptr != NUL)
  106.       {
  107.       count += win_lbr_chartabsize(wp, ptr, count, NULL);
  108.       mb_ptr_adv(ptr);
  109. *** ../vim-7.3.694/src/version.c    2012-10-21 00:44:59.000000000 +0200
  110. --- src/version.c    2012-10-21 00:50:32.000000000 +0200
  111. ***************
  112. *** 721,722 ****
  113. --- 721,724 ----
  114.   {   /* Add new patch number below this line */
  115. + /**/
  116. +     695,
  117.   /**/
  118.  
  119. -- 
  120. BEDEVERE:        Why do you think she is a witch?
  121. SECOND VILLAGER: She turned me into a newt.
  122. BEDEVERE:        A newt?
  123. SECOND VILLAGER: (After looking at himself for some time) I got better.
  124.                  "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
  125.  
  126.  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  127. ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  128. \\\  an exciting new programming language -- http://www.Zimbu.org        ///
  129.  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
  130.