From 0eb2dea555a3776384a82bfc07d07e9d14be500d Mon Sep 17 00:00:00 2001
From: Rainer Kottenhoff <rainer.kottenhoff@gmail.com>
Date: Thu, 19 Apr 2018 16:44:20 +0200
Subject: [PATCH] + fix: restore correct fold margin

---
 src/Edit.c     | 2 +-
 src/Notepad3.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Edit.c b/src/Edit.c
index 0b9a8e7f8..dec5e407c 100644
--- a/src/Edit.c
+++ b/src/Edit.c
@@ -6700,7 +6700,7 @@ void EditHideNotMarkedLineRange(HWND hwnd, DocPos iStartPos, DocPos iEndPos, boo
     SciCall_FoldAll(SC_FOLDACTION_EXPAND);
     SciCall_MarkerDeleteAll(MARKER_NP3_OCCUR_LINE);
     if (!g_bCodeFoldingAvailable) { SciCall_SetProperty("fold", "0"); }
-    Style_SetFolding(hwnd, g_bShowCodeFolding);
+    Style_SetFolding(hwnd, g_bCodeFoldingAvailable && g_bShowCodeFolding);
     EditApplyLexerStyle(hwnd, 0, -1);
     ObserveNotifyChangeEvent();
     return;
diff --git a/src/Notepad3.c b/src/Notepad3.c
index 4c5b6a57a..40d100363 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -7207,6 +7207,7 @@ void UpdateVisibleUrlHotspot(int delay)
 #define EnableTool(id,b) SendMessage(g_hwndToolbar,TB_ENABLEBUTTON,id, MAKELONG(((b) ? 1 : 0), 0))
 #define CheckTool(id,b)  SendMessage(g_hwndToolbar,TB_CHECKBUTTON,id, MAKELONG((b),0))
 
+
 void UpdateToolbar()
 {
   SetWindowTitle(g_hwndMain, uidsAppTitle, flagIsElevated, IDS_UNTITLED, g_wchCurFile,