comparison lisp/cc-mode/cc-engine.el @ 181:bfd6434d15b3 r20-3b17

Import from CVS: tag r20-3b17
author cvs
date Mon, 13 Aug 2007 09:53:19 +0200
parents 6075d714658b
children e121b013d1f0
comparison
equal deleted inserted replaced
180:add28d59e586 181:bfd6434d15b3
5 ;; Authors: 1992-1997 Barry A. Warsaw 5 ;; Authors: 1992-1997 Barry A. Warsaw
6 ;; 1987 Dave Detlefs and Stewart Clamen 6 ;; 1987 Dave Detlefs and Stewart Clamen
7 ;; 1985 Richard M. Stallman 7 ;; 1985 Richard M. Stallman
8 ;; Maintainer: cc-mode-help@python.org 8 ;; Maintainer: cc-mode-help@python.org
9 ;; Created: 22-Apr-1997 (split from cc-mode.el) 9 ;; Created: 22-Apr-1997 (split from cc-mode.el)
10 ;; Version: 5.14 10 ;; Version: 5.15
11 ;; Keywords: c languages oop 11 ;; Keywords: c languages oop
12 12
13 ;; This file is part of GNU Emacs. 13 ;; This file is part of GNU Emacs.
14 14
15 ;; GNU Emacs is free software; you can redistribute it and/or modify 15 ;; GNU Emacs is free software; you can redistribute it and/or modify
1143 ;; CASE 5D.3: perhaps a multiple inheritance line? 1143 ;; CASE 5D.3: perhaps a multiple inheritance line?
1144 ((looking-at c-inher-key) 1144 ((looking-at c-inher-key)
1145 (c-add-syntax 'inher-cont (c-point 'boi))) 1145 (c-add-syntax 'inher-cont (c-point 'boi)))
1146 ;; CASE 5D.4: perhaps a template list continuation? 1146 ;; CASE 5D.4: perhaps a template list continuation?
1147 ((save-excursion 1147 ((save-excursion
1148 (goto-char indent-point)
1148 (skip-chars-backward "^<" lim) 1149 (skip-chars-backward "^<" lim)
1149 ;; not sure if this is the right test, but it should 1150 ;; not sure if this is the right test, but it should
1150 ;; be fast and mostly accurate. 1151 ;; be fast and mostly accurate.
1151 (and (eq (char-before) ?<) 1152 (and (eq (char-before) ?<)
1152 (not (c-in-literal lim)))) 1153 (not (c-in-literal lim))))
1153 ;; we can probably indent it just like and arglist-cont 1154 ;; we can probably indent it just like an arglist-cont
1154 (c-add-syntax 'arglist-cont (point))) 1155 (c-add-syntax 'template-args-cont (point)))
1155 ;; CASE 5D.5: perhaps a top-level statement-cont 1156 ;; CASE 5D.5: perhaps a top-level statement-cont
1156 (t 1157 (t
1157 (c-beginning-of-statement-1 lim) 1158 (c-beginning-of-statement-1 lim)
1158 ;; skip over any access-specifiers 1159 ;; skip over any access-specifiers
1159 (and inclass-p c-access-key 1160 (and inclass-p c-access-key