fix crash in backspace

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 5dc94c8184f516c386b72875089965cdd8ef8c41..06a3694601590127f76afdf25ec3abf2d075eabb 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+
+2004-11-11  Alfredo Braunstein  <abraunst@lyx.org>
+
+       * text.C (backspace): fix crash
+
 2004-11-09  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
 
        * format.[Ch] (getFormatFromFile): new method

diff --git a/src/text.C b/src/text.C
index fc41964fa042ec897b7990e1125bc025d088175c..c6dcac79284b215805bd18b5494b701cf429e3ac 100644 (file)
--- a/src/text.C
+++ b/src/text.C
@@ -1631,7 +1631,7 @@ void LyXText::backspace(LCursor & cur)
                    && (pars_[cpit].layout() == pars_[tmppit].layout()
                        || pars_[tmppit].layout() == tclass.defaultLayout())
                    && pars_[cpit].getAlign() == pars_[tmppit].getAlign()) {
-                       mergeParagraph(bufparams, buf.paragraphs(), cpit);
+                       mergeParagraph(bufparams, pars_, cpit);
 
                        if (cur.pos() != 0 && pars_[cpit].isSeparator(cur.pos() - 1))
                                --cur.pos();