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

3 files changed, 39 insertions, 25 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index fb969069c6c..c27b9b5f437 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,11 @@
+2014-04-09  Glenn Morris  <rgm@gnu.org>
+
+        * automated/python-tests.el (python-triple-quote-pairing):
+        Enable/disable electric-pair-mode as needed.
+
+        * automated/electric-tests.el (electric-pair-backspace-1):
+        Replace deleted function.
+
 2014-04-07  João Távora  <joaotavora@gmail.com>
 
         * automated/python-tests.el (python-triple-quote-pairing): New test.
diff --git a/test/automated/electric-tests.el b/test/automated/electric-tests.el
index bcef9cc2adb..6a70080fde5 100644
--- a/test/automated/electric-tests.el
+++ b/test/automated/electric-tests.el
@@ -509,7 +509,7 @@ baz\"\""
     (with-temp-buffer
       (insert "()")
       (goto-char 2)
-      (electric-pair-backward-delete-char 1)
+      (electric-pair-delete-pair 1)
       (should (equal "" (buffer-string))))))
 
 
diff --git a/test/automated/python-tests.el b/test/automated/python-tests.el
index 8fe8f71264f..de963a670bc 100644
--- a/test/automated/python-tests.el
+++ b/test/automated/python-tests.el
@@ -2722,30 +2722,36 @@ def foo(a, b, c):
    (should (= (point) (point-min)))))
 
 (ert-deftest python-triple-quote-pairing ()
-  (python-tests-with-temp-buffer
-      "\"\"\n"
-    (goto-char (1- (point-max)))
-    (let ((last-command-event ?\"))
-      (call-interactively 'self-insert-command))
-    (should (string= (buffer-string)
-                     "\"\"\"\"\"\"\n"))
-    (should (= (point) 4)))
-  (python-tests-with-temp-buffer
-      "\n"
-    (let ((last-command-event ?\"))
-      (dotimes (i 3)
-        (call-interactively 'self-insert-command)))
-    (should (string= (buffer-string)
-                     "\"\"\"\"\"\"\n"))
-    (should (= (point) 4)))
-  (python-tests-with-temp-buffer
-      "\"\n\"\"\n"
-    (goto-char (1- (point-max)))
-    (let ((last-command-event ?\"))
-      (call-interactively 'self-insert-command))
-    (should (= (point) (1- (point-max))))
-    (should (string= (buffer-string)
-                     "\"\n\"\"\"\n"))))
+  (require 'electric)
+  (let ((epm electric-pair-mode))
+    (unwind-protect
+        (progn
+          (python-tests-with-temp-buffer
+           "\"\"\n"
+           (or epm (electric-pair-mode 1))
+           (goto-char (1- (point-max)))
+           (let ((last-command-event ?\"))
+             (call-interactively 'self-insert-command))
+           (should (string= (buffer-string)
+                            "\"\"\"\"\"\"\n"))
+           (should (= (point) 4)))
+          (python-tests-with-temp-buffer
+           "\n"
+           (let ((last-command-event ?\"))
+             (dotimes (i 3)
+               (call-interactively 'self-insert-command)))
+           (should (string= (buffer-string)
+                            "\"\"\"\"\"\"\n"))
+           (should (= (point) 4)))
+          (python-tests-with-temp-buffer
+           "\"\n\"\"\n"
+           (goto-char (1- (point-max)))
+           (let ((last-command-event ?\"))
+             (call-interactively 'self-insert-command))
+           (should (= (point) (1- (point-max))))
+           (should (string= (buffer-string)
+                            "\"\n\"\"\"\n"))))
+      (or epm (electric-pair-mode -1)))))
 
 
 (provide 'python-tests)