YABG from Alfredo

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6887 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index dcb0fc9b09acaf1131f35929981bfaeac55ed24e..f4f40b13025895591570fb4654bb0ced5dbc83b7 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
+2003-04-29  Alfredo Braunstein  <abraunst@libero.it>
+
+       * text3.C (gotoInset): YABG (yet another bad getChar)
 
-2003-04-29 André Pönitz <poenitz@gmx.net>
+2003-04-29  André Pönitz  <poenitz@gmx.net>
 
        * paragraph.h: make operator= private unimplemented as long as
          it is unusable
@@ -7,17 +10,20 @@
        * ParagraphList.C: whitespace
 
        * paragraph.[Ch]:
-         paragraph_pimpl.[Ch]:
-         paragraph_funcs.C:
-               CutAndPaste.C:
-         undo_funcs.C: whitespace + Paragraph *  -> Paragraph (const) &
+       * paragraph_pimpl.[Ch]:
+       * paragraph_funcs.C:
+       * CutAndPaste.C:
+       * undo_funcs.C: whitespace + Paragraph *  -> Paragraph (const) &
 
        * text2.C:
          undo_funcs.[Ch]: Paragraph * -> ParagraphList::iterator
 
 2003-04-29  Alfredo Braunstein  <abraunst@libero.it>
 
-       * CutAndPaste.C (cutSelection): big rework, some bugs fixed
+       * CutAndPaste.[Ch] (cutSelection): big rework, some bugs fixed
+       * paragraph.[Ch] (erase):
+       * paragraph_pimpl.[Ch] (erase): change return type and value
+       * text2.C (cutSelection): some rework
  
 2003-04-28  John Levon  <levon@movementarian.org>
 
@@ -30,7 +36,7 @@
 
        * buffer.C (readFile): ws changes only.
 
-2003-04-28 André Pönitz <poenitz@gmx.net>
+2003-04-28  André Pönitz  <poenitz@gmx.net>
 
        * undo_funcs.C:
        * lyxfunc.C:
@@ -38,7 +44,7 @@
        * BufferView_pimpl.C:
        * BufferView.C: getParFromID related ParagraphList::iterator changes
 
-2003-04-28 André Pönitz <poenitz@gmx.net>
+2003-04-28  André Pönitz  <poenitz@gmx.net>
 
        * tabular.[Ch]: part of Lars' Paragraph * -> ParagraphList::iterator
          Changes

diff --git a/src/text3.C b/src/text3.C
index 1df3ba307dfaf02877a8a5546c8b9039d3d08e34..06df6eac83643a7932fb4fe5d7804f22384ad1fd 100644 (file)
--- a/src/text3.C
+++ b/src/text3.C
@@ -201,14 +201,15 @@ bool LyXText::gotoNextInset(vector<Inset::Code> const & codes,
 
 
 void LyXText::gotoInset(vector<Inset::Code> const & codes,
-                                 bool same_content)
+                       bool same_content)
 {
        bv()->hideCursor();
        bv()->beforeChange(this);
        update();
 
        string contents;
-       if (same_content && cursor.par()->isInset(cursor.pos())) {
+       if (same_content && cursor.pos() < cursor.par()->size()
+           && cursor.par()->isInset(cursor.pos())) {
                Inset const * inset = cursor.par()->getInset(cursor.pos());
                if (find(codes.begin(), codes.end(), inset->lyxCode())
                    != codes.end())
@@ -1403,9 +1404,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
                        UpdatableInset * inset = static_cast<UpdatableInset *>(inset_hit);
                        selection_possible = false;
                        bv->owner()->message(inset->editMessage());
-                       //inset->edit(bv, x, y, cmd.button());
                        // We just have to lock the inset before calling a PressEvent on it!
-                       // we don't need the edit() call here! (Jug20020329)
                        if (!bv->lockInset(inset))
                                lyxerr[Debug::INSETS] << "Cannot lock inset" << endl;
                        FuncRequest cmd1(bv, LFUN_MOUSE_PRESS, x, y, cmd.button());