Amend the version number of CC Mode 5.33 -> 5.32.99. Don't merge to trunk.

lisp/progmodes/cc-defs.el: Amend the version number.
etc/NEWS: Add an item explaining the change.

diff --git a/etc/NEWS b/etc/NEWS
index f679243190776278ec1e4d4c4e38c2cdabc48ef1..38975a7fa1e56a9b5319a3ff749af1077b6607ab 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -50,6 +50,13 @@ Set this variable to a non-nil value to speed up display of characters
 using large fonts, at the price of a larger memory footprint of the
 Emacs session.
 
++++
+** The version number of CC Mode has been changed from 5.33 to
+5.32.99, although the software itself hasn't changed.  This aims to
+reduce confusion with the standalone CC Mode 5.33 (available from
+http://cc-mode.sourceforge.net), which is a more mature version than
+the one in Emacs 25.2.
+
 \f
 * Installation Changes in Emacs 25.1
 

diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el
index 4c78bc3975c397c8bcb013537741cf7d5e64243e..251e338c944421a5b90ebaa5b043865226ad8d3a 100644 (file)
--- a/lisp/progmodes/cc-defs.el
+++ b/lisp/progmodes/cc-defs.el
@@ -94,7 +94,7 @@
 \f
 ;;; Variables also used at compile time.
 
-(defconst c-version "5.33"
+(defconst c-version "5.32.99"
   "CC Mode version number.")
 
 (defconst c-version-sym (intern c-version))