X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXRC.cpp;h=3f9366cb044a73234ca9c23ec226cdd0a97526e4;hb=39f3ad8cbc3027b0065a83744b798759fe2a1ee4;hp=50837448a9b8a8deb4adf697ce8ef5f4ceed5793;hpb=b04c22ba6717d839b6721f40a7468caf3fe1226f;p=lyx.git

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index 50837448a9..3f9366cb04 100644
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -85,7 +85,6 @@ LexerKeyword lyxrcTags[] = {
 	{ "\\dialogs_iconify_with_main", LyXRC::RC_DIALOGS_ICONIFY_WITH_MAIN },
 	{ "\\display_graphics", LyXRC::RC_DISPLAY_GRAPHICS },
 	{ "\\document_path", LyXRC::RC_DOCUMENTPATH },
-	{ "\\env_gui_language", LyXRC::RC_ENV_GUI_LANGUAGE },
 	{ "\\escape_chars", LyXRC::RC_ESC_CHARS },
 	{ "\\example_path", LyXRC::RC_EXAMPLEPATH },
 	{ "\\font_encoding", LyXRC::RC_FONT_ENCODING },
@@ -112,6 +111,7 @@ LexerKeyword lyxrcTags[] = {
 	{ "\\language_package", LyXRC::RC_LANGUAGE_PACKAGE },
 	{ "\\language_use_babel", LyXRC::RC_LANGUAGE_USE_BABEL },
 	{ "\\load_session", LyXRC::RC_LOADSESSION },
+	{ "\\mac_like_word_movement", LyXRC::RC_MAC_LIKE_WORD_MOVEMENT },
 	{ "\\macro_edit_style", LyXRC::RC_MACRO_EDIT_STYLE },
 	{ "\\make_backup", LyXRC::RC_MAKE_BACKUP },
 	{ "\\mark_foreign_language", LyXRC::RC_MARK_FOREIGN_LANGUAGE },
@@ -280,13 +280,13 @@ void LyXRC::setDefaults()
 	sort_layouts = false;
 	group_layouts = true;
 	default_language = "english";
-	env_gui_language = true;
-	gui_language = string();
+	gui_language = "auto";
 	show_banner = true;
 	windows_style_tex_paths = false;
 	tex_allows_spaces = false;
 	date_insert_format = "%x";
 	cursor_follows_scrollbar = false;
+	mac_like_word_movement = false;
 	macro_edit_style = MACRO_EDIT_INLINE_BOX;
 	dialogs_iconify_with_main = false;
 	label_init_length = 3;
@@ -802,6 +802,10 @@ int LyXRC::read(Lexer & lexrc)
 			lexrc >> cursor_follows_scrollbar;
 			break;
 
+		case RC_MAC_LIKE_WORD_MOVEMENT:
+			lexrc >> mac_like_word_movement;
+			break;
+
 		case RC_MACRO_EDIT_STYLE:
 			if (lexrc.next()) {
 				switch (lexrc.getInteger()) {
@@ -996,10 +1000,6 @@ int LyXRC::read(Lexer & lexrc)
 			lexrc >> default_language;
 			break;
 
-		case RC_ENV_GUI_LANGUAGE:
-			lexrc >> env_gui_language;
-			break;
-
 		case RC_GUI_LANGUAGE:
 			lexrc >> gui_language;
 			break;
@@ -1494,6 +1494,15 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 		}
 		if (tag != RC_LAST)
 			break;
+	case RC_MAC_LIKE_WORD_MOVEMENT:
+		if (ignore_system_lyxrc ||
+		    mac_like_word_movement
+		    != system_lyxrc.mac_like_word_movement) {
+			os << "\\mac_like_word_movement "
+			   << convert<string>(mac_like_word_movement) << '\n';
+		}
+		if (tag != RC_LAST)
+			break;
 	case RC_MACRO_EDIT_STYLE:
 		if (ignore_system_lyxrc ||
 		    macro_edit_style
@@ -2275,13 +2284,6 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 		}
 		if (tag != RC_LAST)
 			break;
-	case RC_ENV_GUI_LANGUAGE:
-		if (ignore_system_lyxrc ||
-		    env_gui_language != system_lyxrc.env_gui_language) {
-			os << "\\env_gui_language " << env_gui_language << '\n';
-		}
-		if (tag != RC_LAST)
-			break;
 	case RC_GUI_LANGUAGE:
 		if (ignore_system_lyxrc ||
 		    gui_language != system_lyxrc.gui_language) {
@@ -2470,6 +2472,10 @@ string const LyXRC::getDescription(LyXRCTags tag)
 		str = _("LyX normally doesn't update the cursor position if you move the scrollbar. Set to true if you'd prefer to always have the cursor on screen.");
 		break;
 
+	case RC_MAC_LIKE_WORD_MOVEMENT:
+		str = _("Use the Mac OS X conventions for the word-level cursor movement");
+		break;
+
 	case RC_SHOW_MACRO_LABEL:
 		str = _("Show a small box around a Math Macro with the macro name when the cursor is inside.");
 		break;