From 3c996729cf97201dac5734be610663b20c48eac7 Mon Sep 17 00:00:00 2001
From: Derick Payne <rizonetech@gmail.com>
Date: Sun, 15 Oct 2017 15:37:21 +0200
Subject: [PATCH 1/2] Prepared Build 600

---
 Versions/build.txt             | 6 +-----
 distrib/Changes.txt            | 7 +++++++
 res/Notepad3.exe.manifest.conf | 2 +-
 src/VersionEx.h                | 4 ++--
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Versions/build.txt b/Versions/build.txt
index f78b60d58..e9f960cf4 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-584
-=======
-586
->>>>>>> 652902a3d996c0e4b379c602bcccf72189f71df6
+600
diff --git a/distrib/Changes.txt b/distrib/Changes.txt
index 3fe16739e..15c00d0ab 100644
--- a/distrib/Changes.txt
+++ b/distrib/Changes.txt
@@ -2,6 +2,13 @@
 Rizonesoft Notepad3 CHANGES
 ==================================================
 
+--------------------------------------------------
+Version 2 Build 600 (15 October 2017)
+--------------------------------------------------
+~ Fix: Virtual space access: column indicator.
+~ Fix: Customize Schemes... Font... selection: bold/italic now detected 
+  (bold: if selection >= FW_SEMIBOLD)
+
 --------------------------------------------------
 Version 2 Build 583 (11 October 2017)
 --------------------------------------------------
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index d9795e111..1e59df875 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="2.17.1011.583"
+    version="2.17.1015.600"
     type="win32"
   />
   <description>Notepad3</description>
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 9a54f0d83..0eea1ba8f 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -1,5 +1,5 @@
 #define VERSION_MAJOR 2
 #define VERSION_MINOR 17
-#define VERSION_REV 1011
-#define VERSION_BUILD 583
+#define VERSION_REV 1015
+#define VERSION_BUILD 600
 #define SCINTILLA_VER 400

From d352b3d6bd5e39594132df3b9975d15a21bad9e8 Mon Sep 17 00:00:00 2001
From: Rainer Kottenhoff <rainer.kottenhoff@gmail.com>
Date: Sun, 15 Oct 2017 18:52:13 +0200
Subject: [PATCH 2/2] +fix: crash on accessing UndoRedo structure while NP3
 instance has not been initialized completely (.LOG file opening bug)

---
 src/Notepad3.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Notepad3.c b/src/Notepad3.c
index 890ade4d6..eb4b21596 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -7388,16 +7388,17 @@ int UndoRedoSelectionMap(int token, UndoRedoSelection_t* selection)
 {
   static unsigned int iTokenCnt = 0;
   
+  if (UndoRedoSelectionUTArray == NULL)
+    return -1;
+
   // indexing is unsigned
   unsigned int utoken = (token >= 0) ? (unsigned int)token : 0U;
 
   if (selection == NULL) {
     // reset / clear
     SendMessage(hwndEdit,SCI_EMPTYUNDOBUFFER,0,0);
-    if (UndoRedoSelectionUTArray != NULL) {
-      utarray_clear(UndoRedoSelectionUTArray);
-      utarray_init(UndoRedoSelectionUTArray,&UndoRedoSelection_icd);
-    }
+    utarray_clear(UndoRedoSelectionUTArray);
+    utarray_init(UndoRedoSelectionUTArray,&UndoRedoSelection_icd);
     iTokenCnt = 0U;
     return -1;
   }