diff --git a/far/changelog b/far/changelog index eb4ac88750..818cebe2be 100644 --- a/far/changelog +++ b/far/changelog @@ -1,4 +1,8 @@ -w17 12.03.2015 17:40:22 +0300 - build 4304 +zg 15.03.2015 03:02:46 +0200 - build 4305 + +1. в ProcessEditorInput не посылаются псевдоклавиши KEY_IDLE и KEY_NONE. + +w17 12.03.2015 17:40:22 +0300 - build 4304 1. Уточнение 4302. diff --git a/far/fileedit.cpp b/far/fileedit.cpp index af72716d35..29afa1a4d2 100644 --- a/far/fileedit.cpp +++ b/far/fileedit.cpp @@ -954,7 +954,15 @@ int FileEditor::ReProcessKey(int Key,int CalledFromControl) _SVS(if (Global->CtrlObject->Macro.IsRecording() == MACROSTATE_RECORDING_COMMON || Global->CtrlObject->Macro.IsExecuting() == MACROSTATE_EXECUTING_COMMON)) _SVS(SysLog(L"%d !!!! Global->CtrlObject->Macro.GetState() != MACROSTATE_NOMACRO !!!!",__LINE__)); - ProcessedNext=!ProcessEditorInput(Global->WindowManager->GetLastInputRecord()); + switch (Key) + { + case KEY_IDLE: + case KEY_NONE: + break; + default: + ProcessedNext=!ProcessEditorInput(Global->WindowManager->GetLastInputRecord()); + break; + } } if (ProcessedNext) diff --git a/far/vbuild.m4 b/far/vbuild.m4 index edc03d0676..a9988e6ce8 100644 --- a/far/vbuild.m4 +++ b/far/vbuild.m4 @@ -1 +1 @@ -m4_define(BUILD,4304)m4_dnl +m4_define(BUILD,4305)m4_dnl