(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.

diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 69a61c4f0fb42c8dbca499bea59b3913b53c8577..7d164f9e868d788e42feff9fb0816ece50e857a9 100644 (file)
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -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