fix free memory read when pasting + some typos

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

diff --git a/src/BufferView2.C b/src/BufferView2.C
index b58b1c3ca69174f352dac9b8b5d30db93e1f9121..6226a7edafdb902e692d37b9fdb6b09d4ecc372c 100644 (file)
--- a/src/BufferView2.C
+++ b/src/BufferView2.C
@@ -231,7 +231,7 @@ void BufferView::menuUndo()
                beforeChange(text);
                update(text, BufferView::SELECT|BufferView::FITCUR);
                if (!textUndo(this))
-                       owner()->message(_("No forther undo information"));
+                       owner()->message(_("No further undo information"));
                else
                        update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                setState();

diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index eb645466b8a2e6c45f49929f3eac1efa38be1715..ee68b85a97a99dfd390f4a2c33c09b9fb5c35e6c 100644 (file)
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -2738,7 +2738,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
                if (floatList.typeExist(argument)) {
                        insertAndEditInset(new InsetFloat(argument));
                } else {
-                       lyxerr << "Non-existant float type: "
+                       lyxerr << "Non-existent float type: "
                               << argument << endl;
                }
                break;
@@ -2754,7 +2754,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
                        else
                                delete new_inset;
                } else {
-                       lyxerr << "Non-existant float type: "
+                       lyxerr << "Non-existent float type: "
                               << argument << endl;
                }
                

diff --git a/src/ChangeLog b/src/ChangeLog
index ea98b1d6514e6e51a3074cf56b87e9017629431d..3ba82da3925616da4eb451a2212317cce441b70f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2001-09-20  Michael Schmitt  <Michael.Schmitt@teststep.org>
+
+       * several files: fix typos in user-visible strings
+
+2001-09-18  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * text2.C (pasteSelection): do not set the selection, since it
+       will be cleared later. Actually, the intent was to fix the way the
+       selection was set, but I figured rmoving the code was just as good.
+
 2001-09-19  Dekel Tsur  <dekelts@tau.ac.il>
 
        * FontLoader.C (available): Check if font is available without

diff --git a/src/insets/insetfloatlist.C b/src/insets/insetfloatlist.C
index 2e50cf80e33d334c018704e8e99575708bfabf34..b10e2b5a69cbd362954d4d25919cd4110c8ed604 100644 (file)
--- a/src/insets/insetfloatlist.C
+++ b/src/insets/insetfloatlist.C
@@ -19,7 +19,7 @@ string const InsetFloatList::getScreenLabel(Buffer const *) const
                string const res = guiName + _(" List");
                return res;
        }
-       return _("ERROR nonexistant float type!");
+       return _("ERROR: Nonexistent float type!");
 }
 
 

diff --git a/src/layout.C b/src/layout.C
index 8f4dfffdd5ffb6bc7d46890f6462b785bf5a7718..b4fb05f7337277dbb499475ae90c16d2ad285fa4 100644 (file)
--- a/src/layout.C
+++ b/src/layout.C
@@ -1431,7 +1431,7 @@ bool LyXTextClassList::Read ()
                lyxerr << "LyXTextClassList::Read: no textclasses found!"
                       << endl;
                WriteAlert(_("LyX wasn't able to find any layout description!"),
-                          _("Check the contents of  the file \"textclass.lst\""),
+                          _("Check the contents of the file \"textclass.lst\""),
                           _("Sorry, has to exit :-("));
                return false;
        }

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index 1306b2bddf820c18679e0b00ff5d432af49597ff..a49b202dc8f5d75ea1ff294479ee959618eda813 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -358,7 +358,7 @@ void AutoSave(BufferView * bv)
                                // It is dangerous to do this in the child,
                                // but safe in the parent, so...
                                if (pid == -1)
-                                       bv->owner()->message(_("Autosave Failed!"));
+                                       bv->owner()->message(_("Autosave failed!"));
                        }
                }
                if (pid == 0) { // we are the child so...

diff --git a/src/text2.C b/src/text2.C
index 526f671a7b7d5e5133b7e858738f1becfd255810..caaa887447852a72d031f4f13dbad8c409ff93f3 100644 (file)
--- a/src/text2.C
+++ b/src/text2.C
@@ -1839,8 +1839,8 @@ void LyXText::pasteSelection(BufferView * bview)
 
        Paragraph * endpar;
        Paragraph * actpar = cursor.par();
-
        int pos = cursor.pos();
+
        CutAndPaste::pasteSelection(&actpar, &endpar, pos,
                                    bview->buffer()->params.textclass);
     
@@ -1849,9 +1849,7 @@ void LyXText::pasteSelection(BufferView * bview)
        setCursor(bview, cursor.par(), cursor.pos());
        clearSelection();
    
-       selection.cursor = cursor;
        setCursor(bview, actpar, pos);
-       setSelection(bview);
        updateCounters(bview, cursor.row());
 }