fix 4656.2 & minor

far/changelog

@@ -1,4 +1,10 @@
-drkns 03.05.2016 16:58:07 +0200 - build 4660
+drkns 04.05.2016 10:20:21 +0200 - build 4661
+
+1. Уточнение 4656.2.
+
+2. Пара мелочей.
+
+drkns 03.05.2016 16:58:07 +0200 - build 4660
 
 1. Уточнение 4656.2.
 

far/cmdline.cpp

@@ -896,11 +896,14 @@ class execution_context: noncopyable
 
 		Global->WindowManager->ActivateWindow(Global->CtrlObject->Desktop);
 		Global->WindowManager->ShowBackground();
+
+		// ShowCommand is false when there is no "command" - class instantiated by FCTL_GETUSERSCREEN.
 		if (m_ShowCommand)
 		{
 			Global->CtrlObject->CmdLine()->DrawFakeCommand(m_Command);
+			ScrollScreen(1);
 		}
-		ScrollScreen(1);
+
 		Global->CtrlObject->Desktop->TakeSnapshot();
 		int X1, Y1, X2, Y2;
 		Global->CtrlObject->CmdLine()->GetPosition(X1, Y1, X2, Y2);

far/common.hpp

@@ -213,6 +213,15 @@ class writable_blob: public blob
 	bool m_Allocated;
 };
 
+namespace enum_helpers
+{
+	template<class O, class R = void, class T>
+	constexpr auto operation(T a, T b)
+	{
+		return static_cast<std::conditional_t<std::is_same<R, void>::value, T, R>>(O()(static_cast<std::underlying_type_t<T>>(a), static_cast<std::underlying_type_t<T>>(b)));
+	}
+}
+
 #ifdef _DEBUG
 #define SELF_TEST(code) \
 namespace \

far/scrbuf.hpp

@@ -48,24 +48,17 @@ enum class flush_type
 	all = screen | cursor | title
 };
 
-inline auto operator|(flush_type a, flush_type b)
+inline constexpr auto operator|(flush_type a, flush_type b)
 {
-	return static_cast<flush_type>(
-		static_cast<std::underlying_type_t<flush_type>>(a) |
-		static_cast<std::underlying_type_t<flush_type>>(b)
-	);
+	return enum_helpers::operation<std::bit_or<>>(a, b);
 }
 
-inline auto operator&(flush_type a, flush_type b)
+inline constexpr auto operator&(flush_type a, flush_type b)
 {
-	return
-		static_cast<std::underlying_type_t<flush_type>>(a) &
-		static_cast<std::underlying_type_t<flush_type>>(b);
+	return enum_helpers::operation<std::bit_and<>, std::underlying_type_t<flush_type>>(a, b);
 }
 
-
 class ScreenBuf: noncopyable
-
 {
 public:
 	ScreenBuf();

far/vbuild.m4

@@ -1 +1 @@
-m4_define(BUILD,4660)m4_dnl
+m4_define(BUILD,4661)m4_dnl