X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXRC.cpp;h=8b7c3b3ec89756bdeda71245322239e9ec4cb39d;hb=0c7bd9a57f2a308bb9659200eda3b7e45f8d5d3c;hp=d4bac81278c0682b98568ffa6a196dd5a7e8f085;hpb=c671740d8323c99526f0d3d2e9bc34b6accc65b6;p=lyx.git

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index d4bac81278..8b7c3b3ec8 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;
@@ -334,6 +334,7 @@ void LyXRC::setDefaults()
 	full_screen_toolbars = true;
 	full_screen_tabbar = true;
 	full_screen_menubar = true;
+	full_screen_statusbar = true;
 	full_screen_scrollbar = true;
 	full_screen_width = 700;
 
@@ -1054,16 +1055,18 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
 		}
 		case RC_VIEWER_ALTERNATIVES:  {
 			string format, command;
-			lexrc >> format;
-			lexrc >> command;
-			viewer_alternatives[format].insert(command);
+			if ((lexrc >> format) && lexrc.next(true)) {
+				command  = lexrc.getString();
+				viewer_alternatives[format].insert(command);
+			}
 			break;
 		}
 		case RC_EDITOR_ALTERNATIVES:  {
 			string format, command;
-			lexrc >> format;
-			lexrc >> command;
-			editor_alternatives[format].insert(command);
+			if ((lexrc >> format) && lexrc.next(true)) {
+				command  = lexrc.getString();
+				editor_alternatives[format].insert(command);
+			}
 			break;
 		}
 
@@ -2710,6 +2713,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
 	case LyXRC::RC_ACCEPT_COMPOUND:
 		if (lyxrc_orig.spellchecker_accept_compound != lyxrc_new.spellchecker_accept_compound)
 			if (theSpellChecker()) theSpellChecker()->advanceChangeNumber();
+		// fall through
 	case LyXRC::RC_ALT_LANG:
 	case LyXRC::RC_PLAINTEXT_LINELEN:
 	case LyXRC::RC_AUTOCORRECTION_MATH:
@@ -2753,6 +2757,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
 			if (path.exists() && path.isDirectory())
 				package().document_dir() = FileName(lyxrc.document_path);
 		}
+		// fall through
 	case LyXRC::RC_EDITOR_ALTERNATIVES:
 	case LyXRC::RC_ESC_CHARS:
 	case LyXRC::RC_EXAMPLEPATH:
@@ -2794,6 +2799,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
 			// Resets python path
 			support::os::python(true);
 		}
+		// fall through
 	case LyXRC::RC_PREVIEW:
 	case LyXRC::RC_PREVIEW_HASHED_LABELS:
 	case LyXRC::RC_PREVIEW_SCALE_FACTOR:
@@ -2820,6 +2826,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
 	case LyXRC::RC_SPELLCHECKER:
 		if (lyxrc_orig.spellchecker != lyxrc_new.spellchecker)
 			setSpellChecker();
+		// fall through
 	case LyXRC::RC_SPELLCHECK_CONTINUOUSLY:
 	case LyXRC::RC_SPELLCHECK_NOTES:
 	case LyXRC::RC_SPLITINDEX_COMMAND:
@@ -2830,6 +2837,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
 		if (lyxrc_orig.windows_style_tex_paths != lyxrc_new.windows_style_tex_paths) {
 			os::windows_style_tex_paths(lyxrc_new.windows_style_tex_paths);
 		}
+		// fall through
 	case LyXRC::RC_TEXINPUTS_PREFIX:
 	case LyXRC::RC_THESAURUSDIRPATH:
 	case LyXRC::RC_UIFILE:
@@ -3069,8 +3077,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: