Cherrypicked minor upstream fixes

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7319 212acab6-be3b-0410-9dea-997c60f758d6

Docs/src/bin/halibut/input.c

@@ -763,7 +763,10 @@ static void read_file(paragraph *** ret, input * in, indexdata * idx, tree234 *m
         break;
       case c__comment:
         if (isbrace(in))
+        {
+          needkw = -1; // Upstream 56b96573 (r8312)
           break;                /* `\#{': isn't a comment para */
+        }
         do
         {
           dtor(t), t = get_token(in);