Make layout test compile

[lyx.git] / src / LyX.cpp

diff --git a/src/LyX.cpp b/src/LyX.cpp
index 99ce873b61c0394db4ea9517df9b6eb55e655a3b..b7848311b85a6a10450572285cab072a7bcf0f94 100644 (file)
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -33,6 +33,7 @@
 #include "FuncStatus.h"
 #include "HunspellChecker.h"
 #include "KeyMap.h"
+#include "Language.h"
 #include "LaTeXFonts.h"
 #include "LayoutFile.h"
 #include "Lexer.h"
@@ -563,10 +564,8 @@ void LyX::execCommands()
                // if some files were specified at command-line we assume that the
                // user wants to edit *these* files and not to restore the session.
                for (size_t i = 0; i != pimpl_->files_to_load_.size(); ++i) {
-                       FileName const abs_path = 
-                               support::makeAbsPath(pimpl_->files_to_load_[i]);
                        lyx::dispatch(
-                               FuncRequest(LFUN_FILE_OPEN, abs_path.absoluteFilePath()));
+                               FuncRequest(LFUN_FILE_OPEN, pimpl_->files_to_load_[i]));
                }
                // clear this list to save a few bytes of RAM
                pimpl_->files_to_load_.clear();
@@ -846,6 +845,7 @@ bool LyX::init()
                lyxrc.print();
 
        os::windows_style_tex_paths(lyxrc.windows_style_tex_paths);
+       // Prepend path prefix a second time to take the user preferences into a account
        if (!lyxrc.path_prefix.empty())
                prependEnvPath("PATH", replaceEnvironmentPath(lyxrc.path_prefix));