To: vim-dev@vim.org
Subject: Patch 6.1.087
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 6.1.087
Problem:    A thesaurus with Japanese characters has problems with characters
	    in different word classes.
Solution:   Only separate words with single-byte non-word characters.
	    (Muraoka Taro)
Files:	    src/edit.c


*** ../vim61.086/src/edit.c	Fri May 17 19:29:08 2002
--- src/edit.c	Thu Jun  6 20:33:36 2002
***************
*** 2043,2049 ****
  				wstart = ptr;
  
  				/* Find end of the word and add it. */
! 				ptr = find_word_end(ptr);
  				add_r = ins_compl_add_infercase(wstart,
  					(int)(ptr - wstart), files[i], dir, 0);
  			    }
--- 2043,2064 ----
  				wstart = ptr;
  
  				/* Find end of the word and add it. */
! #ifdef FEAT_MBYTE
! 				if (has_mbyte)
! 				    /* Japanese words may have characters in
! 				     * different classes, only separate words
! 				     * with single-byte non-word characters. */
! 				    while (*ptr != NUL)
! 				    {
! 					int l = (*mb_ptr2len_check)(ptr);
! 
! 					if (l < 2 && !vim_iswordc(*ptr))
! 					    break;
! 					ptr += l;
! 				    }
! 				else
! #endif
! 				    ptr = find_word_end(ptr);
  				add_r = ins_compl_add_infercase(wstart,
  					(int)(ptr - wstart), files[i], dir, 0);
  			    }
*** ../vim61.086/src/version.c	Tue Jun  4 20:01:34 2002
--- src/version.c	Thu Jun  6 20:33:53 2002
***************
*** 608,609 ****
--- 608,611 ----
  {   /* Add new patch number below this line */
+ /**/
+     87,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
112. You are amazed that anyone uses a phone without a modem on it...let
     alone hear actual voices.

 ///  Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net  \\\
///   Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim   \\\
\\\           Project leader for A-A-P -- http://www.a-a-p.org           ///
 \\\  Help me helping AIDS orphans in Uganda - http://iccf-holland.org  ///