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.4 / 7.4.545 < prev    next >
Encoding:
Internet Message Format  |  2014-12-12  |  1.9 KB
  1. To: vim_dev@googlegroups.com
  2. Subject: Patch 7.4.545
  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.4.545
  11. Problem:    Highlighting for multi-line matches is not correct.
  12. Solution:   Stop highlight at the end of the match. (Hirohito Higashi)
  13. Files:        src/screen.c
  14.  
  15.  
  16. *** ../vim-7.4.544/src/screen.c    2014-11-27 13:37:07.399540002 +0100
  17. --- src/screen.c    2014-12-13 03:30:31.520358269 +0100
  18. ***************
  19. *** 3864,3872 ****
  20.                   && v >= (long)shl->startcol
  21.                   && v < (long)shl->endcol)
  22.               {
  23.                   shl->attr_cur = shl->attr;
  24.               }
  25. !             else if (v >= (long)shl->endcol && shl->lnum == lnum)
  26.               {
  27.                   shl->attr_cur = 0;
  28.                   next_search_hl(wp, shl, lnum, (colnr_T)v, cur);
  29. --- 3864,3878 ----
  30.                   && v >= (long)shl->startcol
  31.                   && v < (long)shl->endcol)
  32.               {
  33. + #ifdef FEAT_MBYTE
  34. +                 int tmp_col = v + MB_PTR2LEN(ptr);
  35. + 
  36. +                 if (shl->endcol < tmp_col)
  37. +                 shl->endcol = tmp_col;
  38. + #endif
  39.                   shl->attr_cur = shl->attr;
  40.               }
  41. !             else if (v == (long)shl->endcol)
  42.               {
  43.                   shl->attr_cur = 0;
  44.                   next_search_hl(wp, shl, lnum, (colnr_T)v, cur);
  45. *** ../vim-7.4.544/src/version.c    2014-12-13 03:20:10.543067406 +0100
  46. --- src/version.c    2014-12-13 03:36:19.704599650 +0100
  47. ***************
  48. *** 743,744 ****
  49. --- 743,746 ----
  50.   {   /* Add new patch number below this line */
  51. + /**/
  52. +     545,
  53.   /**/
  54.  
  55. -- 
  56. You can test a person's importance in the organization by asking how much RAM
  57. his computer has.  Anybody who knows the answer to that question is not a
  58. decision-maker.
  59.                 (Scott Adams - The Dilbert principle)
  60.  
  61.  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  62. ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  63. \\\  an exciting new programming language -- http://www.Zimbu.org        ///
  64.  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
  65.