Mercurial > emacs
changeset 20142:e66d1eef0bff
(c-guess-basic-syntax):
CASE 5F: extern-lang-close relpos should be
element 0 of inclass-p, not element 1.
(c-beginning-of-statement-1):
Watch out for keywords which have a
preceding underscore.
| author | Karl Heuer <kwzh@gnu.org> |
|---|---|
| date | Thu, 23 Oct 1997 07:48:09 +0000 |
| parents | 1a85b213eb6d |
| children | 69ce7b7acfd5 |
| files | lisp/progmodes/cc-engine.el |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/progmodes/cc-engine.el Thu Oct 23 07:47:37 1997 +0000 +++ b/lisp/progmodes/cc-engine.el Thu Oct 23 07:48:09 1997 +0000 @@ -7,7 +7,7 @@ ;; 1985 Richard M. Stallman ;; Maintainer: cc-mode-help@python.org ;; Created: 22-Apr-1997 (split from cc-mode.el) -;; Version: 5.18 +;; Version: See cc-mode.el ;; Keywords: c languages oop ;; This file is part of GNU Emacs. @@ -107,6 +107,7 @@ (and lim (<= lim (point)) (not (c-in-literal lim)) + (not (eq (char-before) ?_)) (looking-at c-conditional-key) )))) ;; did we find a conditional? @@ -1181,7 +1182,7 @@ ;; CASE 5F: extern-lang-close? ((and inextern-p (eq char-after-ip ?})) - (c-add-syntax 'extern-lang-close (aref inclass-p 1))) + (c-add-syntax 'extern-lang-close (aref inclass-p 0))) ;; CASE 5G: we are looking at the brace which closes the ;; enclosing nested class decl ((and inclass-p