Merged from miln005

m4/moo-debug.m4

@@ -61,7 +61,7 @@ MOO_DEBUG_CFLAGS="$MOO_DEBUG_GCC_CFLAGS $MOO_DEBUG_CFLAGS -W -Wall -Wpointer-ari
 -Wcast-align -Wsign-compare -Winline -Wreturn-type dnl
 -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations dnl
 -Wmissing-noreturn -Wmissing-format-attribute -Wnested-externs dnl
--Wdisabled-optimization -Wdeclaration-after-statement"
+-Wdisabled-optimization"
 MOO_PYTHON_DEBUG_CFLAGS="$MOO_DEBUG_GCC_CFLAGS $MOO_PYTHON_DEBUG_CFLAGS -Wall -Wpointer-arith dnl
 -Wcast-align -Wsign-compare -Winline -Wreturn-type dnl
 -Wmissing-prototypes -Wmissing-declarations dnl

moo/mooedit/language-specs/m4.lang

@@ -2,12 +2,18 @@
 <language id="m4" _name="m4" _section="Scripts" version="2.0"
           mimetypes="application/x-m4" globs="*.m4;configure.in;configure.ac">
   <styles>
-    <style id="ps" name="ps" map-to="def:keyword"/>
+    <style id="m4-comment" name="m4-comment" map-to="sh:comment"/>
   </styles>
 
   <definitions>
     <context id="m4">
       <include>
+        <context id="m4-comment" style-ref="m4-comment" end-at-line-end="true">
+          <start>dnl</start>
+          <include>
+            <context ref="sh:comment:*"/>
+          </include>
+        </context>
         <context ref="sh:sh:*"/>
       </include>
     </context>

moo/mooedit/language-specs/sh.lang

@@ -58,7 +58,7 @@
         <context ref="generated-line-escape"/>
       </include>
     </context>
-    <context id="line-comment" style-ref="comment" end-at-line-end="true">
+    <context id="comment" style-ref="comment" end-at-line-end="true">
       <start>#</start>
       <include>
         <context ref="generated-escape"/>
@@ -295,7 +295,7 @@
         <context ref="string"/>
         <context ref="string-2"/>
         <context ref="backtick-string"/>
-        <context ref="line-comment"/>
+        <context ref="comment"/>
         <context ref="punctuator"/>
         <context ref="function"/>
         <context ref="redirection"/>