merge

--HG-- branch : pmacs2
2011-08-16 11:24:17 -04:00 · 2011-08-16 11:24:17 -04:00 · b688872ae9
parent 5ba91e2ab1 23fa8d39a1
commit b688872ae9
1 changed files with 2 additions and 2 deletions
--- a/mode/c.py
+++ b/mode/c.py
@ -125,8 +125,8 @@ class CTabber2(tab.StackTabber2):
        # this assumes that people aren't gonna use these macros inside of
        # blocks, which is probably ok.
        t = tokens[0]
-        if t.fqmatchs('c.macro.start', ('#define', '#include')):
-            return True
+        #if t.fqmatchs('c.macro.start', ('#define', '#include')):
+        #    return True

        # detecting function declarations is annoying; this assumes that people
        # won't put a variable type and name on different lines, but that they