Commit b1e8e010 authored by Alan Mackenzie's avatar Alan Mackenzie
Browse files

Indent statements in macros following "##" correctly.

* progmodes/cc-engine.el (c-crosses-statement-barrier-p): Modify
the "#" arm of a cond form to handle "#" and "##" operators.
parent a94fc965
2013-10-27 Alan Mackenzie <acm@muc.de>
Indent statements in macros following "##" correctly.
* progmodes/cc-engine.el (c-crosses-statement-barrier-p): Modify
the "#" arm of a cond form to handle "#" and "##" operators.
2013-10-27 Nathan Trapuzzano <nbtrap@nbtrap.com> (tiny change) 2013-10-27 Nathan Trapuzzano <nbtrap@nbtrap.com> (tiny change)
* linum.el (linum-update-window): Fix boundary test (bug#13446). * linum.el (linum-update-window): Fix boundary test (bug#13446).
......
...@@ -1261,12 +1261,15 @@ comment at the start of cc-engine.el for more info." ...@@ -1261,12 +1261,15 @@ comment at the start of cc-engine.el for more info."
;; looking for more : and ?. ;; looking for more : and ?.
(setq c-maybe-labelp nil (setq c-maybe-labelp nil
skip-chars (substring c-stmt-delim-chars 0 -2))) skip-chars (substring c-stmt-delim-chars 0 -2)))
;; At a CPP construct? ;; At a CPP construct or a "#" or "##" operator?
((and c-opt-cpp-symbol (looking-at c-opt-cpp-symbol) ((and c-opt-cpp-symbol (looking-at c-opt-cpp-symbol))
(save-excursion (if (save-excursion
(forward-line 0) (skip-chars-backward " \t")
(looking-at c-opt-cpp-prefix))) (and (bolp)
(c-end-of-macro)) (or (bobp)
(not (eq (char-before (1- (point))) ?\\)))))
(c-end-of-macro)
(skip-chars-forward c-opt-cpp-symbol)))
((memq (char-after) non-skip-list) ((memq (char-after) non-skip-list)
(throw 'done (point))))) (throw 'done (point)))))
;; In trailing space after an as yet undetected virtual semicolon? ;; In trailing space after an as yet undetected virtual semicolon?
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment