alfredo - kill a getchar bad

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6709 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Levon 2003-04-03 17:02:19 +00:00
parent e7f84d282f
commit c321843cee
2 changed files with 11 additions and 7 deletions

View File

@ -1,3 +1,7 @@
2003-04-03 Alfredo Braunstein <abraunst@libero.it>
* text.C: squashed an invalid getChar requester + some ws changes
2003-04-03 John Levon <levon@movementarian.org> 2003-04-03 John Levon <levon@movementarian.org>
* bufferview_funcs.h: * bufferview_funcs.h:

View File

@ -119,8 +119,8 @@ void LyXText::anchor_row(RowList::iterator rit)
anchor_row_ = rit; anchor_row_ = rit;
anchor_row_offset_ = old_y - top_y(); anchor_row_offset_ = old_y - top_y();
lyxerr[Debug::GUI] << "anchor_row(): changing reference to row: " lyxerr[Debug::GUI] << "anchor_row(): changing reference to row: "
<< &*anchor_row_ << " offset: " << anchor_row_offset_ << &*anchor_row_ << " offset: "
<< endl; << anchor_row_offset_ << endl;
} }
@ -313,7 +313,7 @@ lyx::pos_type LyXText::log2vis(lyx::pos_type pos) const
if (bidi_start == -1) if (bidi_start == -1)
return pos; return pos;
else else
return log2vis_list[pos-bidi_start]; return log2vis_list[pos - bidi_start];
} }
@ -322,7 +322,7 @@ lyx::pos_type LyXText::vis2log(lyx::pos_type pos) const
if (bidi_start == -1) if (bidi_start == -1)
return pos; return pos;
else else
return vis2log_list[pos-bidi_start]; return vis2log_list[pos - bidi_start];
} }
@ -331,7 +331,7 @@ lyx::pos_type LyXText::bidi_level(lyx::pos_type pos) const
if (bidi_start == -1) if (bidi_start == -1)
return 0; return 0;
else else
return bidi_levels[pos-bidi_start]; return bidi_levels[pos - bidi_start];
} }
@ -1509,8 +1509,8 @@ void LyXText::breakParagraph(ParagraphList & paragraphs, char keep_layout)
// move one row up! // move one row up!
// This touches only the screen-update. Otherwise we would may have // This touches only the screen-update. Otherwise we would may have
// an empty row on the screen // an empty row on the screen
if (cursor.pos() && !cursor.row()->par()->isNewline(cursor.row()->pos() - 1) if (cursor.pos() && cursor.row()->pos() == cursor.pos()
&& cursor.row()->pos() == cursor.pos()) && !cursor.row()->par()->isNewline(cursor.pos() - 1))
{ {
cursorLeft(bv()); cursorLeft(bv());
} }