Mercurial > emacs
comparison lisp/progmodes/cc-engine.el @ 107305:0b830883578a
Fix bug #5649: 23.1.92; Indentation problems in C mode.
author | Alan Mackenzie <acm@muc.de> |
---|---|
date | Mon, 01 Mar 2010 11:31:42 +0000 |
parents | a83491958b95 |
children | 94dd0c99026d |
comparison
equal
deleted
inserted
replaced
107304:adb459b371a3 | 107305:0b830883578a |
---|---|
2639 ;; time round; the corresponding elements in `c-state-cache' are | 2639 ;; time round; the corresponding elements in `c-state-cache' are |
2640 ;; removed. `pos' is just after the brace-pair or the open paren at | 2640 ;; removed. `pos' is just after the brace-pair or the open paren at |
2641 ;; (car c-state-cache). There can be no open parens/braces/brackets | 2641 ;; (car c-state-cache). There can be no open parens/braces/brackets |
2642 ;; between `good-pos'/`good-pos-actual-macro-start' and (point-max), | 2642 ;; between `good-pos'/`good-pos-actual-macro-start' and (point-max), |
2643 ;; due to the interface spec to this function. | 2643 ;; due to the interface spec to this function. |
2644 (setq pos (if good-pos-actual-macro-end | 2644 (setq pos (if (and good-pos-actual-macro-end |
2645 (> in-macro-start good-pos-actual-macro-start)) | |
2645 (1+ good-pos-actual-macro-end) ; get outside the macro as | 2646 (1+ good-pos-actual-macro-end) ; get outside the macro as |
2646 ; marked by a `category' text property. | 2647 ; marked by a `category' text property. |
2647 good-pos)) | 2648 good-pos)) |
2648 (goto-char pos) | 2649 (goto-char pos) |
2649 (while (and c-state-cache | 2650 (while (and c-state-cache |