* src/buffer.C (readHeader):

	- reset custom bullets initially. Fixes bug 3312.
* src/bufferparams.C: fix typo in comment

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

diff --git a/src/buffer.C b/src/buffer.C
index e8baf96ec88f3c2c359e976f507f19bb6bdf65f9..365408aa5e8ae52b4a2ad06782efb7d43c63a441 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -428,6 +428,10 @@ int Buffer::readHeader(LyXLex & lex)
        params().headheight.erase();
        params().headsep.erase();
        params().footskip.erase();
+       for (int i = 0; i < 4; ++i) {
+               params().user_defined_bullet(i) = ITEMIZE_DEFAULTS[i];
+               params().temp_bullet(i) = ITEMIZE_DEFAULTS[i];
+       }
 
        ErrorList & errorList = errorLists_["Parse"];
 

diff --git a/src/bufferparams.C b/src/bufferparams.C
index d7e58ef4d7cf6d3351cf5dc8703ae7b0a827fe94..28d56613bccd7c89948b537227e883a19ea119a6 100644 (file)
--- a/src/bufferparams.C
+++ b/src/bufferparams.C
@@ -603,7 +603,7 @@ void BufferParams::writeFile(ostream & os) const
        // the textclass
        os << "\\textclass " << textclasslist[textclass].name() << '\n';
 
-       // then the the preamble
+       // then the preamble
        if (!preamble.empty()) {
                // remove '\n' from the end of preamble
                string const tmppreamble = rtrim(preamble, "\n");