--- a/lisp/cc-mode/cc-styles.el	Mon Aug 13 09:52:21 2007 +0200
+++ b/lisp/cc-mode/cc-styles.el	Mon Aug 13 09:53:19 2007 +0200
@@ -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.14
+;; Version:    5.15
 ;; Keywords:   c languages oop
 
 ;; This file is part of GNU Emacs.
@@ -330,6 +330,7 @@
     (extern-lang-open      . 0)
     (extern-lang-close     . 0)
     (inextern-lang         . +)
+    (template-args-cont    . +)
     )
   "Association list of syntactic element symbols and indentation offsets.
 As described below, each cons cell in this list has the form:
@@ -428,6 +429,7 @@
  extern-lang-open       -- brace that opens an external language block
  extern-lang-close      -- brace that closes an external language block
  inextern-lang          -- analogous to `inclass' syntactic symbol
+ template-args-cont     -- C++ template argument list continuations
 ")
 
 (defun c-get-offset (langelem)
@@ -505,6 +507,7 @@
 			    nil))))
     offset))
 
+;;;###autoload
 (defun c-set-offset (symbol offset &optional add-p)
   "Change the value of a syntactic element symbol in `c-offsets-alist'.
 SYMBOL is the syntactic element symbol to change and OFFSET is the new