forked from Botanical/BotanJS
		
	Merge remote-tracking branch 'vim/master' into Astro
This commit is contained in:
		@@ -158,8 +158,7 @@
 | 
			
		||||
 | 
			
		||||
		this.__nline = occurence( removed, "\n" );
 | 
			
		||||
 | 
			
		||||
		feeder.content = c.substring( 0, s ) + c.substring( e + 1 );
 | 
			
		||||
		if( feeder.content === "" ) feeder.content = "\n";
 | 
			
		||||
		feeder.content = c.substring( 0, s ) + c.substring( e + 1 ) + "\n";
 | 
			
		||||
 | 
			
		||||
		// Try to keep the original panning if possible
 | 
			
		||||
		feeder.pan( undefined
 | 
			
		||||
 
 | 
			
		||||
@@ -233,6 +233,18 @@
 | 
			
		||||
			if( startLine.aPos < minAp )
 | 
			
		||||
			{
 | 
			
		||||
				pstart = 0;
 | 
			
		||||
 | 
			
		||||
				if( this.__mode == MODE_LINE )
 | 
			
		||||
				{
 | 
			
		||||
					cur.suppressEvent();
 | 
			
		||||
 | 
			
		||||
					cur.lineEnd( true );
 | 
			
		||||
					nstart = cur.PStart;
 | 
			
		||||
 | 
			
		||||
					cur.moveTo( currAp, true );
 | 
			
		||||
 | 
			
		||||
					cur.unsuppressEvent();
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
			// highlight from the end
 | 
			
		||||
			else if( maxAp < startLine.aPos )
 | 
			
		||||
@@ -309,7 +321,7 @@
 | 
			
		||||
 | 
			
		||||
			// Sets the visual position
 | 
			
		||||
			// s-->e
 | 
			
		||||
			if( 0 < posDiff )
 | 
			
		||||
			if( 0 <= posDiff )
 | 
			
		||||
			{
 | 
			
		||||
				newPos = newPos + 1;
 | 
			
		||||
			}
 | 
			
		||||
 
 | 
			
		||||
@@ -217,7 +217,7 @@
 | 
			
		||||
 | 
			
		||||
		if( tabs )
 | 
			
		||||
		{
 | 
			
		||||
			tabStat = "-" + ( X + tabs.length * line.tabWidth );
 | 
			
		||||
			tabStat = "-" + ( X + tabs.length * ( line.tabWidth - 1 ) );
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		return ( line.lineNum + 1 ) + "," + X + tabStat;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user