Merge from emacs-24; up to 2014-04-02T16:17:08Z!dmantipov@yandex.ru

[gnu-emacs] / test / ChangeLog

diff --git a/test/ChangeLog b/test/ChangeLog
index 8b9b507d1c7c814778ccf60305072c0d065dcb5c..c27b9b5f437251adf67e59a694e848de884d45db 100644 (file)
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -8,16 +8,6 @@
 
 2014-04-07  João Távora  <joaotavora@gmail.com>
 
-       * automated/electric-tests.el (define-electric-pair-test):
-       Don't overtest.
-       (inhibit-in-mismatched-string-inside-ruby-comments): New test.
-       (inhibit-in-mismatched-string-inside-c-comments): New test.
-
-       * automated/electric-tests.el (inhibit-if-strings-mismatched):
-       New test, change from `inhibit-only-of-next-is-mismatched'.
-
-2014-04-06  João Távora  <joaotavora@gmail.com>
-
        * automated/python-tests.el (python-triple-quote-pairing): New test.
        (python-syntax-after-python-backspace): New test.
 
@@ -27,7 +17,19 @@
        (whitespace-skipping-for-quotes-only-inside)
        (whitespace-skipping-quotes-not-without-proper-syntax): New tests.
 
-2014-03-24  Barry O'Reilly  <gundaetiapo@gmail.com>
+2014-04-04  João Távora  <joaotavora@gmail.com>
+
+       * automated/electric-tests.el (define-electric-pair-test):
+       Don't overtest.
+       (inhibit-in-mismatched-string-inside-ruby-comments): New test.
+       (inhibit-in-mismatched-string-inside-c-comments): New test.
+
+2014-04-02  João Távora  <joaotavora@gmail.com>
+
+       * automated/electric-tests.el (inhibit-if-strings-mismatched):
+       New test, change from `inhibit-only-of-next-is-mismatched'.
+
+2014-03-26  Barry O'Reilly  <gundaetiapo@gmail.com>
 
        * automated/undo-tests.el (undo-test-marker-adjustment-nominal):
        (undo-test-region-t-marker): New tests of marker adjustments.
@@ -35,16 +37,18 @@
        (undo-test-region-mark-adjustment): New tests to demonstrate
        bug#16818, which fail without the fix.
 
-2014-03-23  Daniel Colascione  <dancol@dancol.org>
-
-       * automated/cl-lib.el (cl-lib-keyword-names-versus-values): New
-       test: correct parsing of keyword arguments.
-
 2014-03-23  Dmitry Gutov  <dgutov@yandex.ru>
 
        * automated/package-test.el (package-test-describe-package):
        Fix test failure in non-graphical mode.
 
+2014-03-23  Daniel Colascione  <dancol@dancol.org>
+
+       * automated/subword-tests.el (subword-tests2): More subword tests.
+
+       * automated/cl-lib.el (cl-lib-keyword-names-versus-values): New
+       test: correct parsing of keyword arguments.
+
 2014-03-22  Dmitry Gutov  <dgutov@yandex.ru>
 
        * automated/package-test.el (package-test-describe-package):