diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 7c071e72c0..38f10a51f9 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,12 @@ The license applies to all entries newer than 2009-04-28. */ +2010-10-11 09:05 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbide/ideedit.prg + ! Fixed: a small glitch in copy operation. + When two lines were copied, where last line was blank, + paste operation was inserting one more blank line. + 2010-10-10 22:32 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/qtcore/hbqt_hbqslots.cpp * contrib/hbqt/qtcore/hbqt_hbqslots.h diff --git a/harbour/contrib/hbide/ideedit.prg b/harbour/contrib/hbide/ideedit.prg index ce16786b1a..e22199d92c 100644 --- a/harbour/contrib/hbide/ideedit.prg +++ b/harbour/contrib/hbide/ideedit.prg @@ -858,7 +858,7 @@ STATIC FUNCTION hbide_qCursorDownInsert( qCursor ) /*----------------------------------------------------------------------*/ METHOD IdeEdit:copyBlockContents( aCord ) - LOCAL nT, nL, nB, nR, nW, i, cLine, nMode, qClip, oLine + LOCAL nT, nL, nB, nR, nW, i, cLine, nMode, qClip LOCAL cClip := "" HB_TRACE( HB_TR_DEBUG, "IdeEdit:copyBlockContents( aCord )" ) @@ -871,7 +871,9 @@ METHOD IdeEdit:copyBlockContents( aCord ) nW := nR - nL FOR i := nT TO nB cLine := ::getLine( i + 1 ) - oLine := cLine + cLine := strtran( cLine, chr( 13 ) ) + cLine := strtran( cLine, chr( 10 ) ) + IF nMode == selectionMode_stream IF aCord[ 1 ] > aCord[ 3 ] // Selection - bottom to top IF i == nT .AND. i == nB @@ -900,7 +902,7 @@ METHOD IdeEdit:copyBlockContents( aCord ) ENDIF aadd( ::aBlockCopyContents, cLine ) - cClip += cLine + iif( nT == nB, "", iif( i < nB, hb_eol(), iif( cLine == oLine, hb_eol(), "" ) ) ) + cClip += cLine + iif( nT == nB, "", iif( i < nB, hb_eol(), "" ) ) NEXT hbide_blockContents( { nMode, ::aBlockCopyContents } )