Merge from emacs-23; up to 2010-06-11T14:39:54Z!cyd@stupidchicken.com.

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 97fb9711b64253d562ff896af07089fce03eda5c..dae3ab5c71100f5ea2ca870d0bd21cd69877edb5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-17  Juanma Barranquero  <lekktu@gmail.com>
+
+       * progmodes/python.el (python-font-lock-keywords):
+       Add the Python 3.X keyword "nonlocal" (bug#8639).
+
 2011-05-16  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * emacs-lisp/eieio.el (defmethod): Fix quoting of code (bug#8677).