X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiListings.cpp;h=d41724f15bfa5a126aad3c097664efdcbea4f7bd;hb=b7f6b979d0f889f08e735f35378bb20ba3788b4b;hp=561022f595423138571d6892426a458cd75addc4;hpb=8dab1cfe7ee6a3bb6d5e57afb55cb357e1e8ec23;p=lyx.git

diff --git a/src/frontends/qt4/GuiListings.cpp b/src/frontends/qt4/GuiListings.cpp
index 561022f595..d41724f15b 100644
--- a/src/frontends/qt4/GuiListings.cpp
+++ b/src/frontends/qt4/GuiListings.cpp
@@ -320,9 +320,18 @@ string GuiListings::construct_params()
 	InsetListingsParams par;
 	par.setMinted(use_minted);
 	if (use_minted) {
-		if (language == "no language" && !contains(extra, "language="))
-			par.addParam("language", "TeX");
-		else
+		if (language == "no language" && !contains(extra, "language=")) {
+			string const & blp = buffer().params().listings_params;
+			size_t start = blp.find("language=");
+			if (start != string::npos) {
+				start += strlen("language=");
+				size_t len = blp.find(",", start);
+				if (len != string::npos)
+					len -= start;
+				par.addParam("language", blp.substr(start, len));
+			} else
+				par.addParam("language", "TeX");
+		} else
 			par.addParam("language", language);
 	} else if (language != "no language" && !contains(extra, "language=")) {
 		if (dialect.empty())
@@ -433,7 +442,8 @@ void GuiListings::on_languageCO_currentIndexChanged(int index)
 		}
 	}
 	dialectCO->setCurrentIndex(default_dialect);
-	dialectCO->setEnabled(dialectCO->count() > 1);
+	dialectCO->setEnabled(dialectCO->count() > 1
+			      && !buffer().params().use_minted);
 }