summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Mackenzie <acm@muc.de>2016-12-20 21:49:31 +0000
committerAlan Mackenzie <acm@muc.de>2016-12-20 21:49:31 +0000
commit9e1209d7a6e575d80e923bc74587229fa42ddfbf (patch)
tree6debbe40f4dd47ab42847b89541f0dc918b7a5e8
parent88cdf14b37a7344bb266e94512485e3cc738c23d (diff)
downloademacs-9e1209d7a6e575d80e923bc74587229fa42ddfbf.tar.gz
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.
-rw-r--r--etc/NEWS7
-rw-r--r--lisp/progmodes/cc-defs.el2
2 files changed, 8 insertions, 1 deletions
diff --git a/etc/NEWS b/etc/NEWS
index f6792431907..38975a7fa1e 100644
--- 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.
+
* Installation Changes in Emacs 25.1
diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el
index 4c78bc3975c..251e338c944 100644
--- a/lisp/progmodes/cc-defs.el
+++ b/lisp/progmodes/cc-defs.el
@@ -94,7 +94,7 @@
;;; 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))