Project: FAR manager

Revision: 1972

Author: skirda

Date: 04 Sep 2008 08:14:44

• /trunk/unicode_far/vbuild.m4

  ......	@@ -1 +1 @@
  0		m4_define(BUILD,555)m4_dnl
  	0	m4_define(BUILD,556)m4_dnl

• /trunk/unicode_far/fileedit.cpp

  ......	@@ -1604,7 +1604,7 @@
  1604	1604
  1605	1605	fclose (EditFile);
  1606	1606
  1607		if ( bCached )
  	1607	//if ( bCached )
  1608	1608	m_editor->SetCacheParams (&cp);
  1609	1609
  1610	1610	SysErrorCode=GetLastError();
  ......	@@ -2659,6 +2659,14 @@
  2659	2659
  2660	2660	TPosCache32 PosCache={0};
  2661	2661
  	2662	if( Opt.EdOpt.SaveShortPos )
  	2663	{
  	2664	PosCache.Position[0] = pp->SavePos.Line;
  	2665	PosCache.Position[1] = pp->SavePos.Cursor;
  	2666	PosCache.Position[2] = pp->SavePos.ScreenLine;
  	2667	PosCache.Position[3] = pp->SavePos.LeftPos;
  	2668	}
  	2669
  2662	2670	if ( CtrlObject->EditorPosCache->GetPosition(
  2663	2671	strCacheName,
  2664	2672	&PosCache
  ......	@@ -2705,11 +2713,14 @@
  2705	2713	PosCache.Param[3] = cp.LeftPos;
  2706	2714	PosCache.Param[4] = cp.Table;
  2707	2715
  2708		//if no position saved these are nulls
  2709		PosCache.Position[0] = cp.SavePos.Line;
  2710		PosCache.Position[1] = cp.SavePos.Cursor;
  2711		PosCache.Position[2] = cp.SavePos.ScreenLine;
  2712		PosCache.Position[3] = cp.SavePos.LeftPos;
  	2716	if( Opt.EdOpt.SaveShortPos )
  	2717	{
  	2718	//if no position saved these are nulls
  	2719	PosCache.Position[0] = cp.SavePos.Line;
  	2720	PosCache.Position[1] = cp.SavePos.Cursor;
  	2721	PosCache.Position[2] = cp.SavePos.ScreenLine;
  	2722	PosCache.Position[3] = cp.SavePos.LeftPos;
  	2723	}
  2713	2724
  2714	2725	CtrlObject->EditorPosCache->AddPosition(strCacheName, &PosCache);
  2715	2726	}

• /trunk/unicode_far/changelog

  ......	@@ -1,3 +1,12 @@
  	1	svs 04.09.2008 17:08:57 +0300 - build 556
  	2
  	3	1.

• /trunk/unicode_far/editor.cpp

  ......	@@ -6347,7 +6347,7 @@
  6347	6347	CurPtr->GetBinaryString(&SaveStr,&EndSeq,Length);
  6348	6348	TotalSize+=Length+StrLength(EndSeq);
  6349	6349
  6350		if (TotalSize>StartChar)
  	6350	if (TotalSize > StartChar)
  6351	6351	break;
  6352	6352
  6353	6353	CurPtr=CurPtr->m_next;
  ......	@@ -6370,25 +6370,35 @@
  6370	6370
  6371	6371	CurLine->SetLeftPos(pp->LeftPos);
  6372	6372
  6373		return;
  6374	6373	}
  	6374	else if (StartLine != -1 || EdOpt.SavePos)
  	6375	{
  	6376	if (StartLine!=-1)
  	6377	{
  	6378	pp->Line = StartLine-1;
  	6379	pp->ScreenLine = ObjHeight/2; //ScrY
  	6380	if (pp->ScreenLine > pp->Line)
  	6381	pp->ScreenLine = pp->Line;
  	6382	pp->LinePos = ( StartChar > 0 ) ? StartChar-1 : 0;
  	6383	}
  6375	6384
  6376		if ( pp->ScreenLine > ObjHeight)//ScrY //BUGBUG
  6377		pp->ScreenLine=ObjHeight;//ScrY;
  	6385	if ( pp->ScreenLine > ObjHeight)//ScrY //BUGBUG
  	6386	pp->ScreenLine=ObjHeight;//ScrY;
  6378	6387
  6379		if ( pp->Line >= pp->ScreenLine)
  6380		{
  6381		Lock ();
  6382		GoToLine (pp->Line-pp->ScreenLine);
  6383		TopScreen = CurLine;
  	6388	if ( pp->Line >= pp->ScreenLine)
  	6389	{
  	6390	Lock ();
  	6391	GoToLine (pp->Line-pp->ScreenLine);
  	6392	TopScreen = CurLine;
  6384	6393
  6385		for (int I=0; I < pp->ScreenLine; I++)
  6386		ProcessKey(KEY_DOWN);
  	6394	for (int I=0; I < pp->ScreenLine; I++)
  	6395	ProcessKey(KEY_DOWN);
  6387	6396
  6388		CurLine->SetTabCurPos(pp->LinePos);
  6389		CurLine->SetLeftPos(pp->LeftPos);
  	6397	CurLine->SetTabCurPos(pp->LinePos);
  	6398	CurLine->SetLeftPos(pp->LeftPos);
  6390	6399
  6391		Unlock ();
  	6400	Unlock ();
  	6401	}
  6392	6402	}
  6393	6403	}
  6394	6404