(c-buffer-is-cc-mode): New variable.

(c-comment-continuation-stars): New variable.

diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el
index bbf2268116045addd171ac9398e5f2d72c7f44d5..f5fd9b1fc6226038738675785e9afef684c8485e 100644 (file)
--- a/lisp/progmodes/cc-vars.el
+++ b/lisp/progmodes/cc-vars.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.14
+;; Version:    5.15
 ;; Keywords:   c languages oop
 
 ;; This file is part of GNU Emacs.
@@ -105,6 +105,17 @@ according to syntactic analysis via `c-offsets-alist', even when
   :type 'boolean
   :group 'c)
 
+(defcustom c-comment-continuation-stars "* "
+  "*Specifies the leader of continued block comments.
+You should set this variable to the literal string that gets inserted
+at the front of continued block style comment lines.  This should
+either be the empty string, or some number of stars followed by a
+single space.  Note that for line style comments, this variable is not
+used."
+  :type '(choice (const :tag "Use old semantics" nil)
+                string)
+  :group 'c)
+
 (defcustom c-cleanup-list '(scope-operator)
   "*List of various C/C++/ObjC constructs to \"clean up\".
 These clean ups only take place when the auto-newline feature is
@@ -398,6 +409,14 @@ as designated in the variable `c-file-style'.")
 (defvar c-indentation-style c-site-default-style
   "Name of style installed in the current buffer.")
 
+(defvar c-buffer-is-cc-mode nil
+  "Non-nil for all buffers with a `major-mode' derived from CC Mode.
+Otherwise, this variable is nil.  I.e. this variable is non-nil for
+`c-mode', `c++-mode', `objc-mode', `java-mode', `idl-mode', and any
+other non-CC Mode mode that calls `c-initialize-cc-mode'
+\(e.g. `awk-mode').")
+(make-variable-buffer-local 'c-buffer-is-cc-mode)
+
 \f
 (provide 'cc-vars)
 ;;; cc-vars.el ends here