[Emacs-diffs] trunk r113993: Parse C++ inher-intro when there's a template split over 2 lines.

[Alan Mackenzie]

------------------------------------------------------------
revno: 113993
revision-id: address@hidden
parent: address@hidden
committer: Alan Mackenzie <address@hidden>
branch nick: trunk
timestamp: Sun 2013-08-25 13:52:14 +0000
message:
  Parse C++ inher-intro when there's a template split over 2 lines.
  
  * progmodes/cc-engine.el (c-guess-basic-syntax CASE 5C): Code more
  rigorously the search for "class" etc. followed by ":".
  
  * progmodes/cc-langs.el (c-opt-<>-sexp-key): Make the value for
  random languages a regexp which never matches rather than nil.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/progmodes/cc-engine.el    
ccengine.el-20091113204419-o5vbwnq5f7feedwu-1227
  lisp/progmodes/cc-langs.el     cclangs.el-20091113204419-o5vbwnq5f7feedwu-1228

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-08-25 10:09:56 +0000
+++ b/lisp/ChangeLog    2013-08-25 13:52:14 +0000
@@ -1,5 +1,13 @@
 2013-08-25  Alan Mackenzie  <address@hidden>
 
+       Parse C++ inher-intro when there's a template split over 2 lines.
+
+       * progmodes/cc-engine.el (c-guess-basic-syntax CASE 5C): Code more
+       rigorously the search for "class" etc. followed by ":".
+
+       * progmodes/cc-langs.el (c-opt-<>-sexp-key): Make the value for
+       random languages a regexp which never matches rather than nil.
+
        Handle "/"s more accurately in test for virtual semicolons (AWK Mode).
 
        * progmodes/cc-awk.el (c-awk-one-line-possibly-open-string-re)

=== modified file 'lisp/progmodes/cc-engine.el'
--- a/lisp/progmodes/cc-engine.el       2013-08-25 10:09:56 +0000
+++ b/lisp/progmodes/cc-engine.el       2013-08-25 13:52:14 +0000
@@ -9799,12 +9799,12 @@
                              (not (eq (char-after) ?:))
                              )))
                   (save-excursion
-                    (c-backward-syntactic-ws lim)
-                    (if (eq char-before-ip ?:)
-                        (progn
-                          (forward-char -1)
-                          (c-backward-syntactic-ws lim)))
-                    (back-to-indentation)
+                    (c-beginning-of-statement-1 lim)
+                    (when (looking-at c-opt-<>-sexp-key)
+                      (goto-char (match-end 1))
+                      (c-forward-syntactic-ws)
+                      (c-forward-<>-arglist nil)
+                      (c-forward-syntactic-ws))
                     (looking-at c-class-key)))
              ;; for Java
              (and (c-major-mode-is 'java-mode)

=== modified file 'lisp/progmodes/cc-langs.el'
--- a/lisp/progmodes/cc-langs.el        2013-07-27 17:35:04 +0000
+++ b/lisp/progmodes/cc-langs.el        2013-08-25 13:52:14 +0000
@@ -2163,8 +2163,7 @@
 (c-lang-defconst c-opt-<>-sexp-key
   ;; Adorned regexp matching keywords that can be followed by an angle
   ;; bracket sexp.  Always set when `c-recognize-<>-arglists' is.
-  t (if (c-lang-const c-recognize-<>-arglists)
-       (c-make-keywords-re t (c-lang-const c-<>-sexp-kwds))))
+  t (c-make-keywords-re t (c-lang-const c-<>-sexp-kwds)))
 (c-lang-defvar c-opt-<>-sexp-key (c-lang-const c-opt-<>-sexp-key))
 
 (c-lang-defconst c-brace-id-list-kwds