Replace environment variables in PATH prefix

The PATH prefix modified through the GUI was set without
replacing embedded environment variables. This might have
caused problems on Windows with external python installations.

(cherry picked from commit 472bdf59109b4188df3bbad18ac3aa60670962aa)

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index 4ba14e6c7fa437b45dd7e4862b3b7d3423ec63c8..71f184d69d0bd9730218a0fbc4353bc30100e136 100644 (file)
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -2997,7 +2997,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
        case LyXRC::RC_PARAGRAPH_MARKERS:
        case LyXRC::RC_PATH_PREFIX:
                if (lyxrc_orig.path_prefix != lyxrc_new.path_prefix) {
-                       prependEnvPath("PATH", lyxrc_new.path_prefix);
+                       prependEnvPath("PATH", replaceEnvironmentPath(lyxrc_new.path_prefix));
                        // Resets python path
                        support::os::python(true);
                }

diff --git a/status.23x b/status.23x
index d62a9607b62952bf1ee7fcb058c3688698a0d7d0..08f5fcc1244c06db7b222f667cc012e5054b39ef 100644 (file)
--- a/status.23x
+++ b/status.23x
@@ -136,6 +136,8 @@ What's new
 
 - Fix handling of labels with change tracking (bug 6563).
 
+- Expand environment variables when modifying the PATH prefix.
+
 
 
 * INTERNALS