Fixed a regression in here-docs

tsujan · Jan 11, 2021 · 27a9ddd · 27a9ddd
1 parent 1402a49
commit 27a9ddd
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+V0.17.2
+---------
+ * Fixed a regression about here-docs in 0.17.0
+
 V0.17.1
 ---------
  * Removed the code for making the cursor busy after 1 second — cursor overriding isn't marked as thread-safe by Qt.

diff --git a/NEWS b/NEWS
@@ -1,5 +1,5 @@
 Latest version:
 
-	6 Jan 2021, V0.17.0
+	12 Jan 2021, V0.17.0
 
 See "ChangeLog" for changes.
diff --git a/featherpad/highlighter.cpp b/featherpad/highlighter.cpp
@@ -4599,8 +4599,7 @@ void Highlighter::highlightBlock (const QString &text)
      * "Here" Documents *
      ********************/
 
-    if (progLan == "sh" || progLan == "makefile" || progLan == "cmake"
-        || progLan == "perl" || progLan == "ruby")
+    if (progLan == "sh" || progLan == "perl" || progLan == "ruby")
     {
         /* first, handle "__DATA__" in perl */
         if (progLan == "perl")

diff --git a/featherpad/main.cpp b/featherpad/main.cpp
@@ -43,7 +43,7 @@ void handleQuitSignals (const std::vector<int>& quitSignals)
 int main (int argc, char **argv)
 {
     const QString name = "FeatherPad";
-    const QString version = "0.17.1";
+    const QString version = "0.17.2";
     const QString option = QString::fromUtf8 (argv[1]);
     if (option == "--help" || option == "-h")
     {