X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXRC.cpp;h=c8b69d1ec50b1d49f39124bdc079a261acabfa6c;hb=589f49ff366f88e3f3be9424397d9d99ebf44dfe;hp=e18a9d6f62e2500015795c9933a83e37837f8b2f;hpb=f8bfc8405ef3216e76e27c30755aa89af16b9554;p=lyx.git

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index e18a9d6f62..c8b69d1ec5 100644
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -261,7 +261,7 @@ void LyXRC::setDefaults()
 	auto_reset_options = false;
 	plaintext_linelen = 65;
 	mouse_wheel_speed = 1.0;
-	num_lastfiles = maxlastfiles;
+	num_lastfiles = 20;
 	check_lastfiles = true;
 	use_lastfilepos = true;
 	load_session = false;
@@ -604,6 +604,8 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
 
 		case RC_SCREEN_ZOOM:
 			lexrc >> zoom;
+			if (zoom < 10)
+				zoom = 10;
 			break;
 
 		case RC_GEOMETRY_SESSION:
@@ -632,45 +634,33 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
 			break;
 
 		case RC_DOCUMENTPATH:
-			if (lexrc.next()) {
+			if (lexrc.next())
 				document_path = os::internal_path(lexrc.getString());
-				document_path = expandPath(document_path);
-			}
 			break;
 
 		case RC_EXAMPLEPATH:
-			if (lexrc.next()) {
+			if (lexrc.next())
 				example_path = os::internal_path(lexrc.getString());
-				example_path = expandPath(example_path);
-			}
 			break;
 
 		case RC_TEMPLATEPATH:
-			if (lexrc.next()) {
+			if (lexrc.next())
 				template_path = os::internal_path(lexrc.getString());
-				template_path = expandPath(template_path);
-			}
 			break;
 
 		case RC_TEMPDIRPATH:
-			if (lexrc.next()) {
+			if (lexrc.next())
 				tempdir_path = os::internal_path(lexrc.getString());
-				tempdir_path = expandPath(tempdir_path);
-			}
 			break;
 
 		case RC_THESAURUSDIRPATH:
-			if (lexrc.next()) {
+			if (lexrc.next())
 				thesaurusdir_path = os::internal_path(lexrc.getString());
-				thesaurusdir_path = expandPath(thesaurusdir_path);
-			}
 			break;
 
 		case RC_HUNSPELLDIR_PATH:
-			if (lexrc.next()) {
+			if (lexrc.next())
 				hunspelldir_path = os::internal_path(lexrc.getString());
-				hunspelldir_path = expandPath(hunspelldir_path);
-			}
 			break;
 
 		case RC_USELASTFILEPOS:
@@ -811,10 +801,8 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
 			break;
 
 		case RC_SERVERPIPE:
-			if (lexrc.next()) {
+			if (lexrc.next())
 				lyxpipes = os::internal_path(lexrc.getString());
-				lyxpipes = expandPath(lyxpipes);
-			}
 			break;
 
 		case RC_CURSOR_FOLLOWS_SCROLLBAR:
@@ -899,10 +887,8 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
 			lexrc >> save_origin;
 			break;
 		case RC_BACKUPDIR_PATH:
-			if (lexrc.next()) {
+			if (lexrc.next())
 				backupdir_path = os::internal_path(lexrc.getString());
-				backupdir_path = expandPath(backupdir_path);
-			}
 			break;
 		case RC_DEFAULT_DECIMAL_POINT:
 			lexrc >> default_decimal_point;
@@ -3077,8 +3063,7 @@ string const LyXRC::getDescription(LyXRCTags tag)
 		break;
 
 	case RC_MOUSE_WHEEL_SPEED:
-		str = bformat(_("The scrolling speed of the mouse wheel."),
-		      maxlastfiles);
+		str = _("The scrolling speed of the mouse wheel.");
 		break;
 
 	case RC_COMPLETION_POPUP_DELAY: