1 files changed, 10 insertions, 1 deletions
diff --git a/src/Styles.c b/src/Styles.c
index 05be76e..d4cc9ed 100644
--- a/src/Styles.c
+++ b/src/Styles.c
@@ -1761,8 +1761,10 @@ void Style_SetLexer(HWND hwnd,PEDITLEXER pLexNew)
   else
     SendMessage(hwnd,SCI_SETSTYLEBITS,5,0);
 
-  if (pLexNew->iLexer == SCLEX_CPP)
+  if (pLexNew->iLexer == SCLEX_CPP) {
     SendMessage(hwnd,SCI_SETPROPERTY,(WPARAM)"styling.within.preprocessor",(LPARAM)"1");
+    SendMessage(hwnd,SCI_SETPROPERTY,(WPARAM)"lexer.cpp.track.preprocessor",(LPARAM)"0");
+  }
   else if (pLexNew->iLexer == SCLEX_PASCAL)
     SendMessage(hwnd,SCI_SETPROPERTY,(WPARAM)"lexer.pascal.smart.highlighting",(LPARAM)"1");
   else if (pLexNew->iLexer == SCLEX_NSIS)
@@ -1772,6 +1774,13 @@ void Style_SetLexer(HWND hwnd,PEDITLEXER pLexNew)
     SendMessage(hwnd,SCI_SETPROPERTY,(WPARAM)"lexer.sql.backticks.identifier",(LPARAM)"1");
   }
 
+  // Code folding
+  SciCall_SetProperty("fold", "1");
+  SciCall_SetProperty("fold.compact", "0");
+  SciCall_SetProperty("fold.comment", "1");
+  SciCall_SetProperty("fold.html", "1");
+  SciCall_SetProperty("fold.preprocessor", "1");
+
   // Add KeyWord Lists
   for (i = 0; i < 9; i++)
     SendMessage(hwnd,SCI_SETKEYWORDS,i,(LPARAM)pLexNew->pKeyWords->pszKeyWords[i]);