diff --git a/src/support/filetools.cpp b/src/support/filetools.cpp index 8f409d7cae..ac46e8efe1 100644 --- a/src/support/filetools.cpp +++ b/src/support/filetools.cpp @@ -607,15 +607,11 @@ string latexEnvCmdPrefix(string const & path) return "env TEXINPUTS=\"." + sep + texinputs_prefix + sep + texinputs + "\" "; else -#ifndef USE_QPROCESS - return "cmd /d /c set \"TEXINPUTS=." + // NOTE: the dummy blank dir is necessary to force the + // QProcess parser to quote the argument (see bug 9453) + return "cmd /d /c set \"TEXINPUTS=." + sep + " " + sep + texinputs_prefix - + sep + texinputs + "\"&"; -#else - return "cmd /d /c set \"\"\"TEXINPUTS=." - + sep + texinputs_prefix - + sep + texinputs + "\"\"\"&"; -#endif + + sep + texinputs + "\" & "; } diff --git a/status.21x b/status.21x index 53b30e3e0c..24082c1cf9 100644 --- a/status.21x +++ b/status.21x @@ -87,6 +87,8 @@ What's new - Fix conversion of beamer block arguments where the overlay argument and the closing title argument bracket share the same ERT (bug 9411). +- Fix handling of the TEXINPUTS environment variable on Windows (bug 9453). + * USER INTERFACE