Merge from emacs-24

[gnu-emacs] / test / ChangeLog

diff --git a/test/ChangeLog b/test/ChangeLog
index 48e01ca973a98ccdafe5efbabc7eed3a1281d579..a09c6f78fc7672b2d5176250235d571093edf3fe 100644 (file)
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,14 @@
+2014-11-16  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+
+       * automated/python-tests.el (python-indent-dedenters-8): New test
+       for Bug#18432.
+
+2014-11-16  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+
+       * automated/python-tests.el (python-indent-region-1)
+       (python-indent-region-2, python-indent-region-3)
+       (python-indent-region-4, python-indent-region-5): New tests.
+
 2014-11-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * automated/bytecomp-tests.el (bytecomp-tests--warnings): New tests.