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

4 files changed, 95 insertions, 2 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
diff --git a/test/automated/electric-tests.el b/test/automated/electric-tests.el
index 9f0973e16b3..bcef9cc2adb 100644
--- a/test/automated/electric-tests.el
+++ b/test/automated/electric-tests.el
@@ -114,8 +114,8 @@
                                      mode
                                      extra-desc))
            ()
-         ,(format "With \"%s\", try input %c at point %d. \
-Should %s \"%s\" and point at %d"
+         ,(format "With |%s|, try input %c at point %d. \
+Should %s |%s| and point at %d"
                   fixture
                   char
                   (1+ pos)
@@ -383,6 +383,31 @@ baz\"\""
   :test-in-code nil
   :test-in-comments t)
 
+(define-electric-pair-test whitespace-skipping-for-quotes-not-ouside
+  "  \"  \"" "\"-----" :expected-string "\"\"  \"  \""
+  :expected-point 2
+  :bindings '((electric-pair-skip-whitespace . chomp))
+  :test-in-strings nil
+  :test-in-code t
+  :test-in-comments nil)
+
+(define-electric-pair-test whitespace-skipping-for-quotes-only-inside
+  "  \"  \"" "---\"--" :expected-string "  \"\""
+  :expected-point 5
+  :bindings '((electric-pair-skip-whitespace . chomp))
+  :test-in-strings nil
+  :test-in-code t
+  :test-in-comments nil)
+
+(define-electric-pair-test whitespace-skipping-quotes-not-without-proper-syntax
+  "  \"  \"" "---\"--" :expected-string "  \"\"\"  \""
+  :expected-point 5
+  :modes '(text-mode)
+  :bindings '((electric-pair-skip-whitespace . chomp))
+  :test-in-strings nil
+  :test-in-code t
+  :test-in-comments nil)
+
 
 ;;; Pairing arbitrary characters
 ;;;
diff --git a/test/automated/python-tests.el b/test/automated/python-tests.el
index dc58138ced4..8fe8f71264f 100644
--- a/test/automated/python-tests.el
+++ b/test/automated/python-tests.el
@@ -134,6 +134,16 @@ aliqua."
 
 ;;; Font-lock and syntax
 
+(ert-deftest python-syntax-after-python-backspace ()
+  ;; `python-indent-dedent-line-backspace' garbles syntax
+  :expected-result :failed
+  (python-tests-with-temp-buffer
+      "\"\"\""
+    (goto-char (point-max))
+    (python-indent-dedent-line-backspace 1)
+    (should (string= (buffer-string) "\"\""))
+    (should (null (nth 3 (syntax-ppss))))))
+
 
 ;;; Indentation
 
@@ -2696,6 +2706,9 @@ def foo(a, b, c):
         (equal (symbol-value (car ccons)) (cdr ccons)))))
     (kill-buffer buffer)))
 
+
+;;; Electricity
+
 (ert-deftest python-util-forward-comment-1 ()
   (python-tests-with-temp-buffer
    (concat
@@ -2708,6 +2721,32 @@ def foo(a, b, c):
    (python-util-forward-comment -1)
    (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"))))
+
 
 (provide 'python-tests)
 
diff --git a/test/indent/perl.perl b/test/indent/perl.perl
index 69c1f90c807..7cb877b0a95 100755
--- a/test/indent/perl.perl
+++ b/test/indent/perl.perl
@@ -16,5 +16,9 @@ EOF1
 bar
 EOF2
 
+print $'; # This should not start a string!
+
+print "hello" for /./;
+
 $fileType_filesButNot           # bug#12373?
     = join( '|', map { quotemeta($_).'$' } @{$fileType->{filesButNot}} );