2 files changed, 53 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 864c4139a7f..3dbf2e7c74a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,51 @@
+2003-09-24  Martin Stjernholm  <bug-cc-mode@gnu.org>
+
+        * progmodes/cc-engine.el (c-parse-state): Fixed bug that could
+        cause errors when the state cache contains info on parts that have
+        been narrowed out.
+
+2003-09-24  Martin Stjernholm  <bug-cc-mode@gnu.org>
+
+        * progmodes/cc-vars.el (c-comment-prefix-regexp): Document that
+        `c-setup-paragraph-variables' has to be used when this variable is
+        changed; it doesn't work to reinitialize the mode since that
+        typically clobbers the variable.
+
+        * progmodes/cc-styles.el (c-setup-paragraph-variables): Made it
+        interactive.
+
+2003-09-24  Martin Stjernholm  <bug-cc-mode@gnu.org>
+
+        * progmodes/cc-fonts.el (c-font-lock-declarations): Fixed
+        recognition of constructors and destructors for classes whose
+        names are matched by `*-font-lock-extra-types'.
+
+        * progmodes/cc-langs.el (c-type-list-kwds): If "operator" is
+        followed by an identifier in C++ then it's a type.
+
+2003-09-24  Martin Stjernholm  <bug-cc-mode@gnu.org>
+
+        * progmodes/cc-fonts.el (c-font-lock-invalid-string): Fixed eob
+        problem that primarily affected XEmacs.  Don't use faces to find
+        unterminated strings since Emacs and XEmacs fontify strings
+        differently - this function should now work better in XEmacs.
+
+2003-09-24  Martin Stjernholm  <bug-cc-mode@gnu.org>
+
+        * progmodes/cc-cmds.el (c-electric-brace): Fixed a bug in the
+        `expand-abbrev' workaround which caused braces to disbehave inside
+        macros.
+
+        * progmodes/cc-engine.el (c-forward-keyword-clause): Fixed error
+        handling.  This bug could cause interactive font locking to bail
+        out.
+
+2003-09-24  Martin Stjernholm  <bug-cc-mode@gnu.org>
+
+        * progmodes/cc-engine.el (c-just-after-func-arglist-p): Handle
+        paren-style types in Pike.  Also fixed some cases of insufficient
+        handling of unbalanced parens.
+
 2003-09-24  Andre Spiegel  <spiegel@gnu.org>
 
         * vc-cvs.el (vc-cvs-parse-entry): Restore the code to compare time
diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el
index 1d253537c8c..cef04a32a5d 100644
--- a/lisp/progmodes/cc-defs.el
+++ b/lisp/progmodes/cc-defs.el
@@ -105,7 +105,7 @@
 
 ;;; Variables also used at compile time.
 
-(defconst c-version "5.30.6"
+(defconst c-version "5.30.7"
   "CC Mode version number.")
 
 (defconst c-version-sym (intern c-version))
@@ -115,10 +115,10 @@
   "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',
-`pike-mode', and any other non-CC Mode mode that calls
-`c-initialize-cc-mode' (e.g. `awk-mode').  The value is the mode
-symbol itself (i.e. `c-mode' etc) of the original CC Mode mode, or
-just t if it's not known.")
+`pike-mode', `awk-mode', and any other non-CC Mode mode that calls
+`c-initialize-cc-mode'.  The value is the mode symbol itself
+\(i.e. `c-mode' etc) of the original CC Mode mode, or just t if it's
+not known.")
 (make-variable-buffer-local 'c-buffer-is-cc-mode)
 
 ;; Have to make `c-buffer-is-cc-mode' permanently local so that it