[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r111607: AWK Mode: Fix indentation bu
From: |
Alan Mackenzie |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r111607: AWK Mode: Fix indentation bug at top level. Bug #12274. |
Date: |
Fri, 25 Jan 2013 18:18:14 +0000 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 111607
committer: Alan Mackenzie <address@hidden>
branch nick: trunk
timestamp: Fri 2013-01-25 18:18:14 +0000
message:
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.
modified:
lisp/ChangeLog
lisp/progmodes/cc-engine.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-01-25 15:48:35 +0000
+++ b/lisp/ChangeLog 2013-01-25 18:18:14 +0000
@@ -1,3 +1,10 @@
+2013-01-25 Alan Mackenzie <address@hidden>
+
+ 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 <address@hidden>
* net/socks.el (socks-nslookup-host): Use string-to-number.
=== modified file 'lisp/progmodes/cc-engine.el'
--- a/lisp/progmodes/cc-engine.el 2013-01-23 18:58:11 +0000
+++ b/lisp/progmodes/cc-engine.el 2013-01-25 18:18:14 +0000
@@ -9842,6 +9842,18 @@
;; 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 @@
(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.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r111607: AWK Mode: Fix indentation bug at top level. Bug #12274.,
Alan Mackenzie <=