Merge from emacs-24; up to 2014-06-22T05:00:14Z!dmantipov@yandex.ru

1 files changed, 30 insertions, 0 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index d4e7f818f1c..6e2f89157e3 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,33 @@
+2014-07-12  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+
+        * automated/python-tests.el (python-indent-block-enders-1)
+        (python-indent-block-enders-2): Fix tests.
+        (python-indent-block-enders-3, python-indent-block-enders-4)
+        (python-indent-block-enders-5, python-indent-dedenters-1)
+        (python-indent-dedenters-2): Remove tests.
+        (python-indent-dedenters-1, python-indent-dedenters-2)
+        (python-indent-dedenters-3, python-indent-dedenters-4)
+        (python-indent-dedenters-5, python-indent-dedenters-6)
+        (python-indent-dedenters-7)
+        (python-info-dedenter-opening-block-position-1)
+        (python-info-dedenter-opening-block-position-2)
+        (python-info-dedenter-opening-block-position-3)
+        (python-info-dedenter-opening-block-positions-1)
+        (python-info-dedenter-opening-block-positions-2)
+        (python-info-dedenter-opening-block-positions-3)
+        (python-info-dedenter-opening-block-positions-4)
+        (python-info-dedenter-opening-block-positions-5)
+        (python-info-dedenter-opening-block-message-1)
+        (python-info-dedenter-opening-block-message-2)
+        (python-info-dedenter-opening-block-message-3)
+        (python-info-dedenter-opening-block-message-4)
+        (python-info-dedenter-opening-block-message-5)
+        (python-info-dedenter-statement-p-1)
+        (python-info-dedenter-statement-p-2)
+        (python-info-dedenter-statement-p-3)
+        (python-info-dedenter-statement-p-4)
+        (python-info-dedenter-statement-p-5): New tests.
+
 2014-07-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * indent/perl.perl: Add indentation pattern for hash-table entries.