To: vim_dev@googlegroups.com

Subject: Patch 7.3.779

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.3.779

Problem:    Backwards search lands in wrong place when started on a multibyte

	    character.

Solution:   Do not set extra_col for a backwards search. (Sung Pae)

Files:	    src/search.c, src/testdir/test44.in, src/testdir/test44.ok

*** ../vim-7.3.778/src/search.c	2013-01-17 17:01:57.000000000 +0100

--- src/search.c	2013-01-23 16:27:35.000000000 +0100

***************

*** 572,578 ****

  	extra_col = 0;

  #ifdef FEAT_MBYTE

      /* Watch out for the "col" being MAXCOL - 2, used in a closed fold. */

!     else if (has_mbyte && pos->lnum >= 1 && pos->lnum <= buf->b_ml.ml_line_count

  						     && pos->col < MAXCOL - 2)

      {

  	ptr = ml_get_buf(buf, pos->lnum, FALSE) + pos->col;

--- 572,579 ----

  	extra_col = 0;

  #ifdef FEAT_MBYTE

      /* Watch out for the "col" being MAXCOL - 2, used in a closed fold. */

!     else if (dir != BACKWARD && has_mbyte

! 		    && pos->lnum >= 1 && pos->lnum <= buf->b_ml.ml_line_count

  						     && pos->col < MAXCOL - 2)

      {

  	ptr = ml_get_buf(buf, pos->lnum, FALSE) + pos->col;

*** ../vim-7.3.778/src/testdir/test44.in	2011-07-20 17:58:14.000000000 +0200

--- src/testdir/test44.in	2013-01-23 16:22:38.000000000 +0100

***************

*** 29,34 ****

--- 29,37 ----

  x/\%d21879b

  x/ [[=A=]]* [[=B=]]* [[=C=]]* [[=D=]]* [[=E=]]* [[=F=]]* [[=G=]]* [[=H=]]* [[=I=]]* [[=J=]]* [[=K=]]* [[=L=]]* [[=M=]]* [[=N=]]* [[=O=]]* [[=P=]]* [[=Q=]]* [[=R=]]* [[=S=]]* [[=T=]]* [[=U=]]* [[=V=]]* [[=W=]]* [[=X=]]* [[=Y=]]* [[=Z=]]*/e

  x/ [[=a=]]* [[=b=]]* [[=c=]]* [[=d=]]* [[=e=]]* [[=f=]]* [[=g=]]* [[=h=]]* [[=i=]]* [[=j=]]* [[=k=]]* [[=l=]]* [[=m=]]* [[=n=]]* [[=o=]]* [[=p=]]* [[=q=]]* [[=r=]]* [[=s=]]* [[=t=]]* [[=u=]]* [[=v=]]* [[=w=]]* [[=x=]]* [[=y=]]* [[=z=]]*/e

+ x:" Test backwards search from a multi-byte char

+ /x

+ x?.

  x:?^1?,$w! test.out

  :e! test.out

  G:put =matchstr(\"אבגד\", \".\", 0, 2) " ב

***************

*** 57,59 ****

--- 60,63 ----

  g a啷bb

  h AÀÁÂÃÄÅĀĂĄǍǞǠẢ BḂḆ CÇĆĈĊČ DĎĐḊḎḐ EÈÉÊËĒĔĖĘĚẺẼ FḞ GĜĞĠĢǤǦǴḠ HĤĦḢḦḨ IÌÍÎÏĨĪĬĮİǏỈ JĴ KĶǨḰḴ LĹĻĽĿŁḺ MḾṀ NÑŃŅŇṄṈ OÒÓÔÕÖØŌŎŐƠǑǪǬỎ PṔṖ Q RŔŖŘṘṞ SŚŜŞŠṠ TŢŤŦṪṮ UÙÚÛÜŨŪŬŮŰŲƯǓỦ VṼ WŴẀẂẄẆ XẊẌ YÝŶŸẎỲỶỸ ZŹŻŽƵẐẔ

  i aàáâãäåāăąǎǟǡả bḃḇ cçćĉċč dďđḋḏḑ eèéêëēĕėęěẻẽ fḟ gĝğġģǥǧǵḡ hĥħḣḧḩẖ iìíîïĩīĭįǐỉ jĵǰ kķǩḱḵ lĺļľŀłḻ mḿṁ nñńņňʼnṅṉ oòóôõöøōŏőơǒǫǭỏ pṕṗ q rŕŗřṙṟ sśŝşšṡ tţťŧṫṯẗ uùúûüũūŭůűųưǔủ vṽ wŵẁẃẅẇẘ xẋẍ yýÿŷẏẙỳỷỹ zźżžƶẑẕ

+ j 0123❤x

*** ../vim-7.3.778/src/testdir/test44.ok	2011-07-20 17:58:14.000000000 +0200

--- src/testdir/test44.ok	2013-01-23 16:22:38.000000000 +0100

***************

*** 16,21 ****

--- 16,22 ----

  g abb

  h AÀÁÂÃÄÅĀĂĄǍǞǠẢ BḂḆ CÇĆĈĊČ DĎĐḊḎḐ EÈÉÊËĒĔĖĘĚẺẼ FḞ GĜĞĠĢǤǦǴḠ HĤĦḢḦḨ IÌÍÎÏĨĪĬĮİǏỈ JĴ KĶǨḰḴ LĹĻĽĿŁḺ MḾṀ NÑŃŅŇṄṈ OÒÓÔÕÖØŌŎŐƠǑǪǬỎ PṔṖ Q RŔŖŘṘṞ SŚŜŞŠṠ TŢŤŦṪṮ UÙÚÛÜŨŪŬŮŰŲƯǓỦ VṼ WŴẀẂẄẆ XẊẌ YÝŶŸẎỲỶỸ ZŹŻŽƵẐ

  i aàáâãäåāăąǎǟǡả bḃḇ cçćĉċč dďđḋḏḑ eèéêëēĕėęěẻẽ fḟ gĝğġģǥǧǵḡ hĥħḣḧḩẖ iìíîïĩīĭįǐỉ jĵǰ kķǩḱḵ lĺļľŀłḻ mḿṁ nñńņňʼnṅṉ oòóôõöøōŏőơǒǫǭỏ pṕṗ q rŕŗřṙṟ sśŝşšṡ tţťŧṫṯẗ uùúûüũūŭůűųưǔủ vṽ wŵẁẃẅẇẘ xẋẍ yýÿŷẏẙỳỷỹ zźżžƶẑ

+ j 012❤

  ב

  בג

  א

*** ../vim-7.3.778/src/version.c	2013-01-23 16:19:17.000000000 +0100

--- src/version.c	2013-01-23 16:39:23.000000000 +0100

***************

*** 727,728 ****

--- 727,730 ----

  {   /* Add new patch number below this line */

+ /**/

+     779,

  /**/

-- 

Veni, Vidi, Video -- I came, I saw, I taped what I saw.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\

///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\

\\\  an exciting new programming language -- http://www.Zimbu.org        ///

 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///