diff --git a/far/changelog b/far/changelog
index e6aea0855d..5623a392de 100644
--- a/far/changelog
+++ b/far/changelog
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+shmuel 2023-11-22 20:50:01+02:00 - build 6215
+
+1. Warnings.
+
 --------------------------------------------------------------------------------
 shmuel 2023-11-21 20:32:53+02:00 - build 6214
 
diff --git a/far/macro.cpp b/far/macro.cpp
index 0beb676e44..f0d43330ba 100644
--- a/far/macro.cpp
+++ b/far/macro.cpp
@@ -3521,21 +3521,21 @@ void FarMacroApi::fargetconfigFunc() const
 	const wchar_t *Keyname = (mData->Count >= 1 && mData->Values[0].Type==FMVT_STRING) ?
 		mData->Values[0].String : L"";
 
-	auto Dot = wcsrchr(Keyname, L'.');
+	const auto Dot = wcsrchr(Keyname, L'.');
 	if (Dot)
 	{
-		string Key(Keyname, Dot - Keyname);
+		const string_view Key(Keyname, Dot - Keyname);
 
-		if (const auto option = Global->Opt->GetConfigValue(Key.c_str(), Dot+1))
+		if (const auto option = Global->Opt->GetConfigValue(Key, Dot+1))
 		{
-			if (const auto Opt = dynamic_cast<const BoolOption*>(option))
+			if (const auto OptBool = dynamic_cast<const BoolOption*>(option))
 			{
-				PassBoolean(Opt->Get());
+				PassBoolean(OptBool->Get());
 				PassValue(L"boolean");
 			}
-			else if (const auto Opt = dynamic_cast<const Bool3Option*>(option))
+			else if (const auto OptBool3 = dynamic_cast<const Bool3Option*>(option))
 			{
-				auto Val = Opt->Get();
+				auto Val = OptBool3->Get();
 				if (Val == 0 || Val == 1)
 					PassBoolean(Val == 1);
 				else
@@ -3543,14 +3543,14 @@ void FarMacroApi::fargetconfigFunc() const
 
 				PassValue(L"3-state");
 			}
-			else if (const auto Opt = dynamic_cast<const IntOption*>(option))
+			else if (const auto OptInt = dynamic_cast<const IntOption*>(option))
 			{
-				PassValue(Opt->Get());
+				PassValue(OptInt->Get());
 				PassValue(L"integer");
 			}
-			else if (const auto Opt = dynamic_cast<const StringOption*>(option))
+			else if (const auto OptString = dynamic_cast<const StringOption*>(option))
 			{
-				PassValue(Opt->Get());
+				PassValue(OptString->Get());
 				PassValue(L"string");
 			}
 			else
diff --git a/far/vbuild.m4 b/far/vbuild.m4
index 5aecb7d325..e45a2a36ce 100644
--- a/far/vbuild.m4
+++ b/far/vbuild.m4
@@ -1 +1 @@
-6214
+6215