From f7ae5b23d1864bcb9e22c33112507a4e6a199b23 Mon Sep 17 00:00:00 2001
From: Valentin Skirdin <vskirdin@gmail.com>
Date: Wed, 25 Jun 2014 07:21:57 +0000
Subject: [PATCH] Mantis#0002692

---
 far/changelog   | 7 ++++++-
 far/dirinfo.cpp | 3 ++-
 far/vbuild.m4   | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/far/changelog b/far/changelog
index ad6779dced..609cc73625 100644
--- a/far/changelog
+++ b/far/changelog
@@ -1,4 +1,9 @@
-w17 25.06.2014 00:16:56 +0400 - build 3962
+svs 25.06.2014 11:17:19 +0400 - build 3963
+
+1. Mantis#0002692: Невозможно прервать операцию, если она запущена из макроса
+   Закомметим и посмотрим.
+
+w17 25.06.2014 00:16:56 +0400 - build 3962
 
 1. Уточнение 3960.
 
diff --git a/far/dirinfo.cpp b/far/dirinfo.cpp
index 433f0fa320..862ce8fb29 100644
--- a/far/dirinfo.cpp
+++ b/far/dirinfo.cpp
@@ -157,7 +157,8 @@ int GetDirInfo(const wchar_t *Title, const string& DirName, DirInfoData& Data, c
 	}
 	while (ScTree.GetNextName(&FindData,strFullName))
 	{
-		if (!Global->CtrlObject->Macro.IsExecuting())
+		// Mantis#0002692
+		//if (!Global->CtrlObject->Macro.IsExecuting())
 		{
 			INPUT_RECORD rec;
 
diff --git a/far/vbuild.m4 b/far/vbuild.m4
index 7c3fe5f7eb..283fa39e62 100644
--- a/far/vbuild.m4
+++ b/far/vbuild.m4
@@ -1 +1 @@
-m4_define(BUILD,3962)m4_dnl
+m4_define(BUILD,3963)m4_dnl