X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXRC.cpp;h=1d7b3c3d8e345a041b3ce615dbccaee477919155;hb=c57dc64116d8d1beb87a6b76a54cfcf82314259a;hp=612168111ef6250063a73f7274d6ae0d4d81adf4;hpb=1139d6cb877acc932d5e4b3111ffdd5d92146f7b;p=lyx.git

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index 612168111e..1d7b3c3d8e 100644
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -1612,8 +1612,9 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 		if (tag != RC_LAST)
 			break;
 	case RC_TEX_EXPECTS_WINDOWS_PATHS:
-		if (ignore_system_lyxrc ||
-		    windows_style_tex_paths != system_lyxrc.windows_style_tex_paths) {
+		// Don't write this setting to the preferences file,
+		// but allow temporary changes (bug 7557).
+		if (ignore_system_lyxrc) {
 			os << "\\tex_expects_windows_paths "
 			   << convert<string>(windows_style_tex_paths) << '\n';
 		}
@@ -2900,6 +2901,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
 	// if we forget an element.
 	LyXRC::LyXRCTags tag = LyXRC::RC_LAST;
 	switch (tag) {
+	case LyXRC::RC_LAST:
 	case LyXRC::RC_ACCEPT_COMPOUND:
 	case LyXRC::RC_ALT_LANG:
 	case LyXRC::RC_PLAINTEXT_LINELEN:
@@ -2939,6 +2941,11 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
 	case LyXRC::RC_DIALOGS_ICONIFY_WITH_MAIN:
 	case LyXRC::RC_DISPLAY_GRAPHICS:
 	case LyXRC::RC_DOCUMENTPATH:
+		if (lyxrc_orig.document_path != lyxrc_new.document_path) {
+			FileName path(lyxrc_new.document_path);
+			if (path.exists() && path.isDirectory())
+				package().document_dir() = FileName(lyxrc.document_path);
+		}
 	case LyXRC::RC_EDITOR_ALTERNATIVES:
 	case LyXRC::RC_ESC_CHARS:
 	case LyXRC::RC_EXAMPLEPATH:
@@ -2975,6 +2982,9 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
 	case LyXRC::RC_NUMLASTFILES:
 	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);
+		}
 	case LyXRC::RC_PREVIEW:
 	case LyXRC::RC_PREVIEW_HASHED_LABELS:
 	case LyXRC::RC_PREVIEW_SCALE_FACTOR:
@@ -3021,6 +3031,9 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
 	case LyXRC::RC_TEMPLATEPATH:
 	case LyXRC::RC_TEX_ALLOWS_SPACES:
 	case LyXRC::RC_TEX_EXPECTS_WINDOWS_PATHS:
+		if (lyxrc_orig.windows_style_tex_paths != lyxrc_new.windows_style_tex_paths) {
+			os::windows_style_tex_paths(lyxrc_new.windows_style_tex_paths);
+		}
 	case LyXRC::RC_TEXINPUTS_PREFIX:
 	case LyXRC::RC_THESAURUSDIRPATH:
 	case LyXRC::RC_UIFILE:
@@ -3049,22 +3062,8 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
 	case LyXRC::RC_DEFAULT_DECIMAL_POINT:
 	case LyXRC::RC_SCROLL_WHEEL_ZOOM:
 	case LyXRC::RC_CURSOR_WIDTH:
-	case LyXRC::RC_LAST:
 		break;
 	}
-
-	// Do what is needed (if any) for changes to actually take effect.
-	if (lyxrc_orig.document_path != lyxrc_new.document_path) {
-		FileName path(lyxrc_new.document_path);
-		if (path.exists() && path.isDirectory())
-			package().document_dir() = FileName(lyxrc.document_path);
-	}
-	if (lyxrc_orig.path_prefix != lyxrc_new.path_prefix) {
-		prependEnvPath("PATH", lyxrc_new.path_prefix);
-	}
-	if (lyxrc_orig.windows_style_tex_paths != lyxrc_new.windows_style_tex_paths) {
-		os::windows_style_tex_paths(lyxrc_new.windows_style_tex_paths);
-	}
 }