From 2b36f4d23a3efc1fc98545f8d7daaed55903e7f5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 20 Oct 2015 00:41:37 +0200
Subject: [PATCH] added one letter to diacritics filter

---
 Telegram/SourceFiles/gui/text.h   |  2 +-
 Telegram/Telegram.vcxproj         |  3 ++
 Telegram/Telegram.vcxproj.filters | 59 ++++++++++++++++++++++++-------
 3 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/Telegram/SourceFiles/gui/text.h b/Telegram/SourceFiles/gui/text.h
index ef0b81d82..8c78bcb90 100644
--- a/Telegram/SourceFiles/gui/text.h
+++ b/Telegram/SourceFiles/gui/text.h
@@ -676,7 +676,7 @@ inline bool chIsTrimmed(QChar ch, bool rich = false) {
 }
 inline bool chIsDiac(QChar ch) { // diac and variation selectors
 	QChar::Category c = ch.category();
-	return (c == QChar::Mark_NonSpacing);
+	return (c == QChar::Mark_NonSpacing) || (ch.unicode() == 1652);
 }
 inline int32 chMaxDiacAfterSymbol() {
 	return 2;
diff --git a/Telegram/Telegram.vcxproj b/Telegram/Telegram.vcxproj
index cc22e26c2..2f5fd505d 100644
--- a/Telegram/Telegram.vcxproj
+++ b/Telegram/Telegram.vcxproj
@@ -2119,6 +2119,9 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </None>
+    <None Include="Telegram.plist" />
+    <None Include="Telegram.xcodeproj\project.pbxproj" />
+    <None Include="Version" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/Telegram/Telegram.vcxproj.filters b/Telegram/Telegram.vcxproj.filters
index 47eb59868..ef06d3cd2 100644
--- a/Telegram/Telegram.vcxproj.filters
+++ b/Telegram/Telegram.vcxproj.filters
@@ -40,6 +40,12 @@
     <Filter Include="langs">
       <UniqueIdentifier>{67311646-a8af-4626-976d-0a5733bf90e8}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Resources">
+      <UniqueIdentifier>{df139398-6d5d-4bd5-8abe-b509b102f5d8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Version">
+      <UniqueIdentifier>{9d7bbb7d-817b-4f19-a719-74e674bdc84b}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="SourceFiles\main.cpp">
@@ -1006,8 +1012,6 @@
     <CustomBuild Include="SourceFiles\gui\flatbutton.h">
       <Filter>gui</Filter>
     </CustomBuild>
-    <CustomBuild Include="Resources\style_classes.txt" />
-    <CustomBuild Include="Resources\style.txt" />
     <CustomBuild Include="SourceFiles\gui\flatinput.h">
       <Filter>gui</Filter>
     </CustomBuild>
@@ -1143,10 +1147,6 @@
     <CustomBuild Include="SourceFiles\localstorage.h">
       <Filter>Source Files</Filter>
     </CustomBuild>
-    <CustomBuild Include="Resources\lang.strings" />
-    <CustomBuild Include="SourceFiles\telegram.qrc" />
-    <CustomBuild Include="SourceFiles\telegram_emojis.qrc" />
-    <CustomBuild Include="SourceFiles\telegram_wnd.qrc" />
     <CustomBuild Include="SourceFiles\boxes\languagebox.h">
       <Filter>boxes</Filter>
     </CustomBuild>
@@ -1189,13 +1189,27 @@
     <CustomBuild Include="SourceFiles\playerwidget.h">
       <Filter>Source Files</Filter>
     </CustomBuild>
-    <CustomBuild Include="Resources\numbers.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="SourceFiles\art\icon256.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="Telegram.rc" />
+    <CustomBuild Include="Resources\lang.strings">
+      <Filter>Resources</Filter>
+    </CustomBuild>
+    <CustomBuild Include="Resources\numbers.txt">
+      <Filter>Resources</Filter>
+    </CustomBuild>
+    <CustomBuild Include="Resources\style.txt">
+      <Filter>Resources</Filter>
+    </CustomBuild>
+    <CustomBuild Include="Resources\style_classes.txt">
+      <Filter>Resources</Filter>
+    </CustomBuild>
+    <CustomBuild Include="SourceFiles\telegram.qrc">
+      <Filter>Resources</Filter>
+    </CustomBuild>
+    <CustomBuild Include="SourceFiles\telegram_emojis.qrc">
+      <Filter>Resources</Filter>
+    </CustomBuild>
+    <CustomBuild Include="SourceFiles\telegram_wnd.qrc">
+      <Filter>Resources</Filter>
+    </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <None Include="SourceFiles\langs\lang_it.strings">
@@ -1219,5 +1233,24 @@
     <None Include="SourceFiles\pspecific_mac_p.mm">
       <Filter>Source Files</Filter>
     </None>
+    <None Include="Telegram.xcodeproj\project.pbxproj">
+      <Filter>Version</Filter>
+    </None>
+    <None Include="Telegram.plist">
+      <Filter>Version</Filter>
+    </None>
+    <None Include="Version">
+      <Filter>Version</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="SourceFiles\art\icon256.ico">
+      <Filter>Resources</Filter>
+    </Image>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Telegram.rc">
+      <Filter>Version</Filter>
+    </ResourceCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file