Merge from emacs-24; up to 2014-04-01T20:18:12Z!eggert@cs.ucla.edu

1 files changed, 25 insertions, 0 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index 4b1e352051b..2ef22c9a4c6 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,28 @@
+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.
+
+2014-04-07  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-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.
+
+2014-04-06  João Távora  <joaotavora@gmail.com>
+
+        * automated/electric-tests.el (electric-pair-define-test-form):
+        More readable test docstrings.
+        (whitespace-skipping-for-quotes-not-ouside)
+        (whitespace-skipping-for-quotes-only-inside)
+        (whitespace-skipping-for-quotes-in-text-mode): New tests.
+
 2014-04-04  João Távora  <joaotavora@gmail.com>
 
         * automated/electric-tests.el (define-electric-pair-test): Don't