* BufferView::updateMetrics(): split up the method in two for the SinglePar case.

[lyx.git] / src / Encoding.cpp

diff --git a/src/Encoding.cpp b/src/Encoding.cpp
index ae03c09b4869006f41363bf09f4bdca4e2112c66..c6441f1dc05607d49ee8f780c7f0400ada17c3c6 100644 (file)
--- a/src/Encoding.cpp
+++ b/src/Encoding.cpp
@@ -519,20 +519,19 @@ void Encodings::read(FileName const & encfile, FileName const & symbolsfile)
                        string const iconvname = lex.getString();
                        lex.next();
                        string const width = lex.getString();
-                       bool fixedwidth;;
+                       bool fixedwidth = false;
                        if (width == "fixed")
                                fixedwidth = true;
                        else if (width == "variable")
                                fixedwidth = false;
                        else {
-                                fixedwidth = false;
                                lex.printError("Encodings::read: "
                                               "Unknown width: `$$Token'");
                         }
                         
                        lex.next();
                        string const p = lex.getString();
-                       Encoding::Package package;
+                       Encoding::Package package = Encoding::none;
                        if (p == "none")
                                 package = Encoding::none;
                        else if (p == "inputenc")
@@ -540,7 +539,6 @@ void Encodings::read(FileName const & encfile, FileName const & symbolsfile)
                        else if (p == "CJK")
                                package = Encoding::CJK;
                        else {
-                                package = Encoding::none;
                                lex.printError("Encodings::read: "
                                               "Unknown package: `$$Token'");
                         }