From b63478b602616f5846257fdbcafe70774052a788 Mon Sep 17 00:00:00 2001
From: Roland Heyder <support@rhosigma-cw.net>
Date: Thu, 18 Aug 2022 23:40:23 +0200
Subject: [PATCH] Step 21: Finalize this PR for merge

- reset .gitignore to disallow any internal\help uploads again (folder is created during build now)
- get rid of old changelog (changes can better be summarized at release pages)
- added a change by @dkearns from the old QB64Team repository (comment highlighting after `REM`)
---
 .gitignore                 |  2 +-
 CHANGELOG.md               | 41 --------------------------------------
 source/ide/ide_methods.bas |  1 +
 3 files changed, 2 insertions(+), 42 deletions(-)
 delete mode 100644 CHANGELOG.md

diff --git a/.gitignore b/.gitignore
index 52a62797e..fb21c9c2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,7 @@ internal/temp*
 *.bas
 internal/config*.txt
 internal/config.ini
-# internal/help
+internal/help
 internal/commit.txt
 tempfoldersearch.bin
 internal/c/qbx[2-9].cpp
diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index 69bfb04a3..000000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# QB64 Phoenix Edition - Changelog
-Upcoming version is currently identified as v2.1, but that number may change before release.
-
-## New features
-### All platforms
-- Implement the `_Bin$` function as counterpart to `&B` prefixed number strings. Usage is analog to the legacy OCT$ and HEX$ functions.
-- Save Watch Panel position and size.
-- Add `$NOPREFIX` support for `$COLOR`.
-- Allow changing color of menu panels and dialogs (Options->IDE Colors).
-- Add support to different number formats in Watch Panel and Watch List dialog (dec/hex/oct/bin).
-
-<!--- 
-### Windows
-
-### macOS
-
-### Linux
---->
-
-## Fixes
-### All platforms
-- Fix function `LOC` returning wrong values when used on physical files.
-- Fix glitch in syntax highlighter mistaking variable names with scientific notation.
-- Fix Variable List dialog's "Add All" button not properly considering the active filter.
-- Fix wiki update feature.
-- Fix issue with Sub/Function parameters in `Declare` blocks with `$NoPrefix`.
-- Fix issue with Sub/Function parameters without types after `As`.
-- Fix issue with capitalization of array names in `LBound/UBound` calls.
-- Fix capitalization of 'To' in `Case` statements.
-- Fix indentation issue in disabled precompiler blocks.
-- Fix crash when a variable was deleted between `$Debug` sessions.
-- Reenables selecting a line by clicking the line number bar when `$Debug` is not used and the `Auto-add $Debug metacommand` feature is disabled.
-
-<!---
-### Windows
-
-### macOS
---->
-
-### Linux
-- Fix building static libraries when installation path contains spaces.
\ No newline at end of file
diff --git a/source/ide/ide_methods.bas b/source/ide/ide_methods.bas
index 7533961d4..036740177 100644
--- a/source/ide/ide_methods.bas
+++ b/source/ide/ide_methods.bas
@@ -12842,6 +12842,7 @@ SUB ideshowtext
                 'Restore BG color in case a matching bracket was printed with different BG
                 IF l = idecy THEN COLOR , 6
                 IF isKeyword > 0 THEN isKeyword = isKeyword - 1
+                IF isKeyword = 0 AND checkKeyword$ = "REM" THEN comment = -1
                 IF isKeyword = 0 THEN checkKeyword$ = "": metacommand = 0: is_Number = 0: isCustomKeyword = 0
             NEXT m