removed a warning from screen and added CFLAGS in lyx.spec.in.

[lyx.git] / src / bufferparams.C

diff --git a/src/bufferparams.C b/src/bufferparams.C
index d043f6583ab0409d5bda137821a22cc4ce5a5f21..5ac2f745842a361a32a44761b125f8cfe98d9a16 100644 (file)
--- a/src/bufferparams.C
+++ b/src/bufferparams.C
@@ -19,7 +19,7 @@
 #include "tex-strings.h"
 #include "layout.h"
 #include "vspace.h"
-#include "error.h"
+#include "debug.h"
 #include "support/lyxlib.h"
 #include "support/lstrings.h"
 
@@ -42,7 +42,7 @@ BufferParams::BufferParams()
        tocdepth = 3;
        language = "default";
        fonts = "default";
-       inputenc = "default";
+       inputenc = "latin1";
        graphicsDriver = "default";
        sides = 1;
        columns = 1;
@@ -236,8 +236,8 @@ void BufferParams::useClassDefaults() {
 void BufferParams::readPreamble(LyXLex &lex)
 {
        if (lex.GetString() != "\\begin_preamble")
-               lyxerr.print("Error (BufferParams::readPreamble):"
-                             "consistency check failed.");
+               lyxerr << "Error (BufferParams::readPreamble):"
+                       "consistency check failed." << endl;
 
        preamble = lex.getLongString("\\end_preamble");
 }
@@ -261,9 +261,10 @@ void BufferParams::readLanguage(LyXLex &lex)
                        break;
                }
                else if (test.empty()) {
-                       lyxerr.print("Warning: language `"
-                                     + tmptok + "' not recognized!");
-                       lyxerr.print("         Setting language to `default'.");
+                       lyxerr << "Warning: language `"
+                              << tmptok << "' not recognized!\n"
+                              << "         Setting language to `default'."
+                              << endl;
                        language = "default";
                        break;   
                }