From 973c506c6ee0ef1b135bfedc1483a986e43669c8 Mon Sep 17 00:00:00 2001 From: Vadim Yegorov Date: Fri, 10 Mar 2017 12:03:19 +0000 Subject: [PATCH] =?UTF-8?q?1.=D0=BF=D1=80=D0=B8=20=D0=BE=D0=BF=D1=80=D0=B5?= =?UTF-8?q?=D0=B4=D0=B5=D0=BB=D1=91=D0=BD=D0=BD=D1=8B=D1=85=20=D1=83=D1=81?= =?UTF-8?q?=D0=BB=D0=BE=D0=B2=D0=B8=D1=8F=D1=85=20=D0=B2=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8C?= =?UTF-8?q?=D1=81=D0=BA=D0=BE=D0=BC=20=D0=BC=D0=B5=D0=BD=D1=8E=20=D1=80?= =?UTF-8?q?=D0=B5=D0=B4=D0=B0=D0=BA=D1=82=D0=BE=D1=80/=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D1=81=D0=BC=D0=BE=D1=82=D1=80=20=D0=B2=D1=8B=D0=B7=D0=B2=D0=B0?= =?UTF-8?q?=D0=BD=D0=BD=D1=8B=D0=B5=20=D0=BF=D0=BE=20edit:/view:=20=D0=B1?= =?UTF-8?q?=D1=8B=D0=BB=D0=B8=20=D0=BC=D0=BE=D0=B4=D0=B0=D0=BB=D1=8C=D0=BD?= =?UTF-8?q?=D1=8B=D0=BC=D0=B8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- far/changelog | 4 ++++ far/usermenu.cpp | 2 -- far/vbuild.m4 | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/far/changelog b/far/changelog index 36ed2a8f89..804e29acb1 100644 --- a/far/changelog +++ b/far/changelog @@ -1,3 +1,7 @@ +zg 10.03.2017 13:55:54 +0200 - build 4912 + +1.при определённых условиях в пользовательском меню редактор/просмотр вызванные по edit:/view: были модальными. + drkns 09.03.2017 07:35:59 +0000 - build 4911 1. 0003404: `Lock editing of read-only files` is ignored (regression) diff --git a/far/usermenu.cpp b/far/usermenu.cpp index 5d6a9d6b0e..253939c840 100644 --- a/far/usermenu.cpp +++ b/far/usermenu.cpp @@ -733,8 +733,6 @@ int UserMenu::ProcessSingleMenu(std::list& Menu, int MenuPos, std: const auto strCmdLineDir = Global->CtrlObject->CmdLine()->GetCurDir(); Global->CtrlObject->CmdLine()->LockUpdatePanel(true); - const auto ConsoleContext = Global->CtrlObject->CmdLine()->GetExecutionContext(); - // Цикл исполнения команд меню (CommandX) std::for_each(CONST_RANGE((*CurrentMenuItem)->Commands, str) { diff --git a/far/vbuild.m4 b/far/vbuild.m4 index 80787f4bcc..0191551787 100644 --- a/far/vbuild.m4 +++ b/far/vbuild.m4 @@ -1 +1 @@ -m4_define(BUILD,4911)m4_dnl +m4_define(BUILD,4912)m4_dnl