AWK Mode: Fix indentation bug at top level. Bug #12274.

progmodes/cc-engine.el (c-guess-basic-syntax): Move CASE 5P to just
before CASE 5D.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8e94ec321471b402a6f6ec5f25d25759dc31ea22..eb9f254a5a873767bfe81844ae449d582286f5eb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2013-01-25  Alan Mackenzie  <acm@muc.de>
+
+       AWK Mode: Fix indentation bug at top level.  Bug #12274.
+
+       * progmodes/cc-engine.el (c-guess-basic-syntax): Move CASE 5P to
+       just before CASE 5D.
+
 2013-01-25  Dmitry Antipov  <dmantipov@yandex.ru>
 
        * net/socks.el (socks-nslookup-host): Use string-to-number.

diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 1eac45d06e0efe4f1f89d36a37a925d1374c17ba..d4e4d6de4830bb5f52e07477216b6325ba85a049 100644 (file)
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -9842,6 +9842,18 @@ comment at the start of cc-engine.el for more info."
            ;; contains any class offset
            )))
 
+        ;; CASE 5P: AWK pattern or function or continuation
+        ;; thereof.
+        ((c-major-mode-is 'awk-mode)
+         (setq placeholder (point))
+         (c-add-stmt-syntax
+          (if (and (eq (c-beginning-of-statement-1) 'same)
+                   (/= (point) placeholder))
+              'topmost-intro-cont
+            'topmost-intro)
+          nil nil
+          containing-sexp paren-state))
+
         ;; CASE 5D: this could be a top-level initialization, a
         ;; member init list continuation, or a template argument
         ;; list continuation.
@@ -10001,18 +10013,6 @@ comment at the start of cc-engine.el for more info."
              (goto-char (point-min)))
          (c-add-syntax 'objc-method-intro (c-point 'boi)))
 
-        ;; CASE 5P: AWK pattern or function or continuation
-        ;; thereof.
-        ((c-major-mode-is 'awk-mode)
-         (setq placeholder (point))
-         (c-add-stmt-syntax
-          (if (and (eq (c-beginning-of-statement-1) 'same)
-                   (/= (point) placeholder))
-              'topmost-intro-cont
-            'topmost-intro)
-          nil nil
-          containing-sexp paren-state))
-
         ;; CASE 5N: At a variable declaration that follows a class
         ;; definition or some other block declaration that doesn't
         ;; end at the closing '}'.  C.f. case 5D.5.