X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXRC.cpp;h=b6462d5d999e4ae81b96461fec85512f1ef60322;hb=51cc1a1cbed395ab79ffa98765231efac4112c56;hp=5e1efcf4105aec295e50ae5d05f958445670af61;hpb=41740ea915ee7a95206d780b6256e660cef39c6e;p=lyx.git

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index 5e1efcf410..b6462d5d99 100644
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -142,6 +142,7 @@ LexerKeyword lyxrcTags[] = {
 	{ "\\macro_edit_style", LyXRC::RC_MACRO_EDIT_STYLE },
 	{ "\\make_backup", LyXRC::RC_MAKE_BACKUP },
 	{ "\\mark_foreign_language", LyXRC::RC_MARK_FOREIGN_LANGUAGE },
+	{ "\\mouse_middlebutton_paste", LyXRC::RC_MOUSE_MIDDLEBUTTON_PASTE },
 	{ "\\mouse_wheel_speed", LyXRC::RC_MOUSE_WHEEL_SPEED },
 	{ "\\nomencl_command", LyXRC::RC_NOMENCL_COMMAND },
 	{ "\\num_lastfiles", LyXRC::RC_NUMLASTFILES },
@@ -377,6 +378,7 @@ void LyXRC::setDefaults()
 	default_length_unit = Length::CM;
 	cursor_width = 1;
 	close_buffer_with_last_view = "yes";
+	mouse_middlebutton_paste = true;
 }
 
 
@@ -1292,6 +1294,10 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
 			}
 			break;
 
+		case RC_MOUSE_MIDDLEBUTTON_PASTE:
+			lexrc >> mouse_middlebutton_paste;
+			break;
+
 		case RC_LAST:
 			break; // this is just a dummy
 		}
@@ -2243,6 +2249,14 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 		}
 		if (tag != RC_LAST)
 			break;
+	case RC_MOUSE_MIDDLEBUTTON_PASTE:
+		if (ignore_system_lyxrc ||
+		    mouse_middlebutton_paste != system_lyxrc.mouse_middlebutton_paste) {
+			os << "\\mouse_middlebutton_paste "
+			   << convert<string>(mouse_middlebutton_paste) << '\n';
+		}
+		if (tag != RC_LAST)
+			break;
 	case RC_COMPLETION_INLINE_DELAY:
 		if (ignore_system_lyxrc ||
 		    completion_inline_delay != system_lyxrc.completion_inline_delay) {
@@ -2330,7 +2344,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 		}
 		if (tag != RC_LAST)
 			break;
-			
+
 		case RC_NUMLASTFILES:
 		if (ignore_system_lyxrc ||
 		    num_lastfiles != system_lyxrc.num_lastfiles) {
@@ -2830,23 +2844,23 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 		for (Converters::const_iterator cit = theConverters().begin();
 		     cit != theConverters().end(); ++cit) {
 			Converter const * converter =
-				theSystemConverters().getConverter(cit->from,
-							       cit->to);
+				theSystemConverters().getConverter(cit->from(),
+				                                   cit->to());
 			if (!converter ||
-			    converter->command != cit->command ||
-			    converter->flags != cit->flags)
-				os << "\\converter \"" << cit->from << "\" \""
-				   << cit->to << "\" \""
-				   << escapeCommand(cit->command) << "\" \""
-				   << cit->flags << "\"\n";
+			    converter->command() != cit->command() ||
+			    converter->flags() != cit->flags())
+				os << "\\converter \"" << cit->from() << "\" \""
+				   << cit->to() << "\" \""
+				   << escapeCommand(cit->command()) << "\" \""
+				   << cit->flags() << "\"\n";
 		}
 
 		// New/modifed converters
 		for (Converters::const_iterator cit = theSystemConverters().begin();
 		     cit != theSystemConverters().end(); ++cit)
-			if (!theConverters().getConverter(cit->from, cit->to))
-				os << "\\converter \"" << cit->from
-				   << "\" \"" << cit->to << "\" \"\" \"\"\n";
+			if (!theConverters().getConverter(cit->from(), cit->to()))
+				os << "\\converter \"" << cit->from()
+				   << "\" \"" << cit->to() << "\" \"\" \"\"\n";
 		if (tag != RC_LAST)
 			break;
 
@@ -2974,6 +2988,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
 	case LyXRC::RC_MAKE_BACKUP:
 	case LyXRC::RC_MARK_FOREIGN_LANGUAGE:
 	case LyXRC::RC_MOUSE_WHEEL_SPEED:
+	case LyXRC::RC_MOUSE_MIDDLEBUTTON_PASTE:
 	case LyXRC::RC_NUMLASTFILES:
 	case LyXRC::RC_PARAGRAPH_MARKERS:
 	case LyXRC::RC_PATH_PREFIX: