From a77db14a3d49bd1a19043d34b3c2efb68d4efc6d Mon Sep 17 00:00:00 2001 From: Vladimir Surguchev Date: Thu, 24 Mar 2016 14:17:52 +0000 Subject: [PATCH] =?UTF-8?q?b4596=20--=20=D0=A3=D1=82=D0=BE=D1=87=D0=BD?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=204595.=20=D0=9F=D0=B5=D1=80=D0=B5?= =?UTF-8?q?=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=82=D0=BE?= =?UTF-8?q?=D0=BB=D1=8C=D0=BA=D0=BE=20=D0=BF=D1=80=D0=B8=20=D0=B0=D0=BA?= =?UTF-8?q?=D1=82=D0=B8=D0=B2=D0=BD=D0=BE=D0=B9=20=D0=BF=D0=B0=D0=BD=D0=B5?= =?UTF-8?q?=D0=BB=D0=B8=20=D0=B8=D0=BD=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=86?= =?UTF-8?q?=D0=B8=D0=B8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- far/changelog | 6 +++++- far/filepanels.cpp | 12 ------------ far/vbuild.m4 | 2 +- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/far/changelog b/far/changelog index 5c01d19fd2..e4a97804b3 100644 --- a/far/changelog +++ b/far/changelog @@ -1,4 +1,8 @@ -w17 24.03.2016 16:14:28 +0300 - build 4595 +w17 24.03.2016 17:14:32 +0300 - build 4596 + +1. Уточнение 4595. Переключение только при активной панели информации. + +w17 24.03.2016 16:14:28 +0300 - build 4595 1. Продолжение 4590, 4594 переключение по Ctrl-Shift-S. diff --git a/far/filepanels.cpp b/far/filepanels.cpp index c0cbfa25f8..9abdff120f 100644 --- a/far/filepanels.cpp +++ b/far/filepanels.cpp @@ -537,18 +537,6 @@ int FilePanels::ProcessKey(const Manager::Key& Key) } break; } - case KEY_CTRLSHIFTS: - case KEY_RCTRLSHIFTS: - { - if (ActivePanel()->IsVisible()) - { - if (ActivePanel()->GetType() == panel_type::INFO_PANEL) - ActivePanel()->ProcessKey(Key); - else if (PassivePanel()->IsVisible() && PassivePanel()->GetType() == panel_type::INFO_PANEL) - PassivePanel()->ProcessKey(Key); - } - break; - } case KEY_CTRLO: case KEY_RCTRLO: { diff --git a/far/vbuild.m4 b/far/vbuild.m4 index db222f87f5..e9e9dc1930 100644 --- a/far/vbuild.m4 +++ b/far/vbuild.m4 @@ -1 +1 @@ -m4_define(BUILD,4595)m4_dnl +m4_define(BUILD,4596)m4_dnl