do not create invalid .lyx files when importing \i{}, \j{}, \l{} or \L{}.

[lyx.git] / src / buffer.C

diff --git a/src/buffer.C b/src/buffer.C
index e3e2ea27e5dd6e625e9318515ae9588bcb83d187..691cd5fa178b957c5bf0b126e30733fcc9594c4f 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -36,7 +36,6 @@
 #include "lyxtext.h"
 #include "lyxrc.h"
 #include "lyxvc.h"
-#include "lyx_main.h"
 #include "messages.h"
 #include "output.h"
 #include "output_docbook.h"
@@ -229,7 +228,7 @@ Buffer::~Buffer()
 
        closing();
 
-       if (!temppath().empty() && !destroyDir(temppath())) {
+       if (!temppath().empty() && !destroyDir(FileName(temppath()))) {
                Alert::warning(_("Could not remove temporary directory"),
                        bformat(_("Could not remove the temporary directory %1$s"),
                        from_utf8(temppath())));
@@ -834,20 +833,7 @@ bool Buffer::makeLaTeXFile(FileName const & fname,
                           OutputParams const & runparams,
                           bool output_preamble, bool output_body)
 {
-       string encoding;
-       if (params().inputenc == "auto")
-               encoding = params().language->encoding()->iconvName();
-       else {
-               Encoding const * enc = encodings.getFromLaTeXName(params().inputenc);
-               if (enc)
-                       encoding = enc->iconvName();
-               else {
-                       lyxerr << "Unknown inputenc value `"
-                              << params().inputenc
-                              << "'. Using `auto' instead." << endl;
-                       encoding = params().language->encoding()->iconvName();
-               }
-       }
+       string const encoding = params().encoding().iconvName();
        lyxerr[Debug::LATEX] << "makeLaTeXFile encoding: "
                << encoding << "..." << endl;