don't rm emergency saves ever

[lyx.git] / src / paragraph_funcs.C

diff --git a/src/paragraph_funcs.C b/src/paragraph_funcs.C
index 306afd958ba56722e3f28c67cc161b78cdc142dc..6b27301b8d31232a68f9b80882345487f3d2c4a4 100644 (file)
--- a/src/paragraph_funcs.C
+++ b/src/paragraph_funcs.C
@@ -149,10 +149,10 @@ void breakParagraphConservative(BufferParams const & bparams,
        // create a new paragraph
        ParagraphList::iterator tmp = paragraphs.insert(boost::next(par),
                                                        new Paragraph);
-       tmp->makeSameLayout(&*par);
+       tmp->makeSameLayout(*par);
 
-       // When can pos > Last()?
-       // I guess pos == Last() is possible.
+       // When can pos > size()?
+       // I guess pos == size() is possible.
        if (par->size() > pos) {
                // copy everything behind the break-position to the new
                // paragraph
@@ -292,7 +292,8 @@ TeXDeeper(Buffer const * buf,
        lyxerr[Debug::LATEX] << "TeXDeeper...     " << &*pit << endl;
        ParagraphList::iterator par = pit;
 
-       while (par != paragraphs.end()&& par->params().depth() == pit->params().depth()) {
+       while (par != paragraphs.end() &&
+                    par->params().depth() == pit->params().depth()) {
                if (par->layout()->isEnvironment()) {
                        par = TeXEnvironment(buf, paragraphs, par,
                                                  os, texrow);
@@ -457,7 +458,7 @@ TeXOnePar(Buffer const * buf,
                }
 
                if (!pit->params().spacing().isDefault()
-                       && (pit == paragraphs.begin() || !boost::prior(pit)->hasSameLayout(&*pit))) {
+                       && (pit == paragraphs.begin() || !boost::prior(pit)->hasSameLayout(*pit))) {
                        os << pit->params().spacing().writeEnvirBegin() << '\n';
                        texrow.newline();
                }
@@ -477,7 +478,9 @@ TeXOnePar(Buffer const * buf,
                }
 
                if (pit->params().lineTop()) {
-                       os << "\\lyxline{\\" << pit->getFont(bparams, 0, outerFont(pit, paragraphs)).latexSize() << '}'
+                       os << "\\lyxline{\\"
+                          << pit->getFont(bparams, 0, outerFont(pit, paragraphs)).latexSize()
+                          << '}'
                           << "\\vspace{-1\\parskip}";
                        further_blank_line = true;
                }
@@ -637,7 +640,7 @@ TeXOnePar(Buffer const * buf,
                }
 
                if (!pit->params().spacing().isDefault()
-                       && (boost::next(pit) == paragraphs.end()|| !boost::next(pit)->hasSameLayout(&*pit))) {
+                       && (boost::next(pit) == paragraphs.end()|| !boost::next(pit)->hasSameLayout(*pit))) {
                        os << pit->params().spacing().writeEnvirEnd() << '\n';
                        texrow.newline();
                }