From: Alan Mackenzie <acm@muc.de>
Date: Thu, 3 Nov 2011 22:10:02 +0000 (+0000)
Subject: Edit lisp/ChangeLog
X-Git-Tag: emacs-pretest-24.0.92~221^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bd17fdeeea1446e098cde7e33e1eea60928c4e53;p=emacs.git

Edit lisp/ChangeLog
---

bd17fdeeea1446e098cde7e33e1eea60928c4e53
diff --cc lisp/ChangeLog
index a94987284de,a94987284de..6352a65e4fc
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,3 -1,3 +1,8 @@@
++2011-11-03  Alan Mackenzie  <acm@muc.de>
++
++	* progmodes/cc-langs.el (c-nonlabel-token-2-key): New variable for
++	change in cc-engine.el.
++
  2011-11-02  Stefan Monnier  <monnier@iro.umontreal.ca>
  
  	* window.el (switch-to-buffer): Use `force-same-window' interactively.
@@@ -136,7 -136,7 +141,6 @@@
  
  	* progmodes/cc-langs.el (c-defun-tactic): Move this variable to
  	cc-vars.el.
--	(c-nonlabel-token-2-key): New variable for change in cc-engine.el.
  
  	* progmodes/cc-engine.el (c-beginning-of-statement-1):
  	Prevent "class foo : bar" being spuriously recognized as a label.