commit/cc-mode: acm: Indent statements in macros following "##" correctly.

1 new commit in cc-mode: https://bitbucket.org/xemacs/cc-mode/commits/d844867caad1/ Changeset: d844867caad1 User: acm Date: 2013-10-27 22:40:19 Summary: Indent statements in macros following "##" correctly. cc-engine.el (c-crosses-statement-barrier-p): Modify the "#" arm of a cond form to handle "#" and "##" operators. Affected #: 1 file diff -r 64ee02d22cfb6b9e7d7ea0f6b75f34bf552f83d1 -r d844867caad1c3bf99d198a9b031cb7fcf99d975 cc-engine.el --- a/cc-engine.el +++ b/cc-engine.el ＠＠ -1266,12 +1266,15 ＠＠ ;; looking for more : and ?. (setq c-maybe-labelp nil skip-chars (substring c-stmt-delim-chars 0 -2))) - ;; At a CPP construct? - ((and c-opt-cpp-symbol (looking-at c-opt-cpp-symbol) - (save-excursion - (forward-line 0) - (looking-at c-opt-cpp-prefix))) - (c-end-of-macro)) + ;; At a CPP construct or a "#" or "##" operator? + ((and c-opt-cpp-symbol (looking-at c-opt-cpp-symbol)) + (if (save-excursion + (skip-chars-backward " \t") + (and (bolp) + (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) (throw 'done (point))))) ;; In trailing space after an as yet undetected virtual semicolon? Repository URL: https://bitbucket.org/xemacs/cc-mode/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches