Index: edit.cpp
===================================================================
--- edit.cpp	(revision 7162)
+++ edit.cpp	(working copy)
@@ -3199,7 +3199,7 @@
 		}
 		if(ComplMenu.GetItemCount()>1 || (ComplMenu.GetItemCount()==1 && StrCmpI(strTemp,ComplMenu.GetItemPtr(0)->strName)))
 		{
-			ComplMenu.SetFlags(VMENU_WRAPMODE|VMENU_NOTCENTER|VMENU_SHOWAMPERSAND);
+			ComplMenu.SetFlags(Opt.AutoComplete.WrapMode?VMENU_WRAPMODE|VMENU_NOTCENTER|VMENU_SHOWAMPERSAND:VMENU_NOTCENTER|VMENU_SHOWAMPERSAND);
 
 			if(!DelBlock && Opt.AutoComplete.AppendCompletion && (!Flags.Check(FEDITLINE_PERSISTENTBLOCKS) || Opt.AutoComplete.ShowList))
 			{
Index: history.cpp
===================================================================
--- history.cpp	(revision 7162)
+++ history.cpp	(working copy)
@@ -164,7 +164,7 @@
 {
 	int Height=ScrY-8;
 	VMenu HistoryMenu(Title,nullptr,0,Height);
-	HistoryMenu.SetFlags(VMENU_SHOWAMPERSAND|VMENU_WRAPMODE);
+	HistoryMenu.SetFlags(Opt.VMenu.HistoryWrapMode?VMENU_WRAPMODE|VMENU_SHOWAMPERSAND:VMENU_SHOWAMPERSAND);
 
 	if (HelpTopic)
 		HistoryMenu.SetHelp(HelpTopic);
Index: config.cpp
===================================================================
--- config.cpp	(revision 7162)
+++ config.cpp	(working copy)
@@ -247,6 +247,7 @@
 	ModalModeCheck->Indent(4);
 	Builder.AddCheckbox(MConfigAutoCompleteAutoAppend, &Opt.AutoComplete.AppendCompletion);
 	Builder.LinkFlags(ListCheck, ModalModeCheck, DIF_DISABLE);
+	Builder.AddCheckbox(MConfigAutoCompleteWrapMode, &Opt.AutoComplete.WrapMode);
 	Builder.AddOKCancel();
 	Builder.ShowDialog();
 }
@@ -342,6 +343,7 @@
 	Builder.AddComboBox((int *) &Opt.VMenu.RBtnClick, 40, CAListItems, ARRAYSIZE(CAListItems), DIF_DROPDOWNLIST|DIF_LISTAUTOHIGHLIGHT|DIF_LISTWRAPMODE);
 	Builder.AddText(MConfigVMenuMBtnClick);
 	Builder.AddComboBox((int *) &Opt.VMenu.MBtnClick, 40, CAListItems, ARRAYSIZE(CAListItems), DIF_DROPDOWNLIST|DIF_LISTAUTOHIGHLIGHT|DIF_LISTWRAPMODE);
+	Builder.AddCheckbox(MConfigVMenuHistoryWrapMode, &Opt.VMenu.HistoryWrapMode);
 	Builder.AddOKCancel();
 	Builder.ShowDialog();
 }
@@ -605,6 +607,7 @@
 	{1, GeneralConfig::TYPE_INTEGER, NKeyInterfaceCompletion,L"ShowList",&Opt.AutoComplete.ShowList, 1, 0},
 	{1, GeneralConfig::TYPE_INTEGER, NKeyInterfaceCompletion,L"ModalList",&Opt.AutoComplete.ModalList, 0, 0},
 	{1, GeneralConfig::TYPE_INTEGER, NKeyInterfaceCompletion,L"Append",&Opt.AutoComplete.AppendCompletion, 0, 0},
+	{1, GeneralConfig::TYPE_INTEGER, NKeyInterfaceCompletion,L"AutoCompleteWrapMode",&Opt.AutoComplete.WrapMode, 1, 0},
 
 	{1, GeneralConfig::TYPE_TEXT,    NKeyViewer,L"ExternalViewerName",&Opt.strExternalViewer, 0, L""},
 	{1, GeneralConfig::TYPE_INTEGER, NKeyViewer,L"UseExternalViewer",&Opt.ViOpt.UseExternalViewer,0, 0},
@@ -874,6 +877,7 @@
 	{1, GeneralConfig::TYPE_INTEGER, NKeyVMenu,L"LBtnClick",&Opt.VMenu.LBtnClick, VMENUCLICK_CANCEL, 0},
 	{1, GeneralConfig::TYPE_INTEGER, NKeyVMenu,L"RBtnClick",&Opt.VMenu.RBtnClick, VMENUCLICK_CANCEL, 0},
 	{1, GeneralConfig::TYPE_INTEGER, NKeyVMenu,L"MBtnClick",&Opt.VMenu.MBtnClick, VMENUCLICK_APPLY, 0},
+	{1, GeneralConfig::TYPE_INTEGER, NKeyVMenu,L"HistoryWrapMode",&Opt.VMenu.HistoryWrapMode, 1, 0},
 };
 
 void ReadConfig()
Index: config.hpp
===================================================================
--- config.hpp	(revision 7162)
+++ config.hpp	(working copy)
@@ -123,6 +123,7 @@
 	int ShowList;
 	int ModalList;
 	int AppendCompletion;
+	int WrapMode;
 };
 
 
@@ -353,6 +354,7 @@
 	int   LBtnClick;
 	int   RBtnClick;
 	int   MBtnClick;
+	int   HistoryWrapMode;
 };
 
 struct CommandLineOptions
Index: farlang.templ.m4
===================================================================
--- farlang.templ.m4	(revision 7162)
+++ farlang.templ.m4	(working copy)
@@ -1863,6 +1863,16 @@
 upd:"Do nothing"
 upd:"Do nothing"
 
+MConfigVMenuHistoryWrapMode
+"Режим &Заворот списка в историях"
+"&Wrap mode in history"
+upd:"Wrap mode in history"
+upd:"Wrap mode in history"
+upd:"Wrap mode in history"
+upd:"Wrap mode in history"
+upd:"Wrap mode in history"
+
+
 MConfigCmdlineTitle
 l:
 "Настройки командной строки"
@@ -1958,6 +1968,15 @@
 upd:"&Append first matched item"
 "&Agregar primer ítem coincidente"
 
+MConfigAutoCompleteWrapMode
+"Режим &Заворот списка"
+"&Wrap mode"
+upd:"Wrap mode"
+upd:"Wrap mode"
+upd:"Wrap mode"
+upd:"Wrap mode"
+upd:"Wrap mode"
+
 MConfigInfoPanelTitle
 l:
 "Настройка информационной панели"