* src/text2.C: deleteEmptyParagraphMechanism(): fix a crash in

[lyx.git] / src / bufferparams.C

diff --git a/src/bufferparams.C b/src/bufferparams.C
index 959d087b79e8184aa0e00207a26f790a3f47b985..dff424a9af00d7cb4d0b5cae3fedd22f7e08c9f9 100644 (file)
--- a/src/bufferparams.C
+++ b/src/bufferparams.C
@@ -1466,20 +1466,14 @@ string const BufferParams::loadFonts(LaTeXFeatures & features, string const & rm
 
 Encoding const & BufferParams::encoding() const
 {
-       if (inputenc == "auto")
+       if (inputenc == "auto" || inputenc == "default")
                return *(language->encoding());
-       Encoding const * const enc = (inputenc == "default") ?
-               encodings.getFromLyXName("iso8859-1") :
+       Encoding const * const enc =
                encodings.getFromLaTeXName(inputenc);
        if (enc)
                return *enc;
-       if (inputenc == "default")
-               lyxerr << "Could not find iso8859-1 encoding for inputenc "
-                         "value `default'. Using inputenc `auto' instead."
-                      << endl;
-       else
-               lyxerr << "Unknown inputenc value `" << inputenc
-                      << "'. Using `auto' instead." << endl;
+       lyxerr << "Unknown inputenc value `" << inputenc
+              << "'. Using `auto' instead." << endl;
        return *(language->encoding());
 }