Inhibit quote autopairing more frequently

Backported from trunk 2014-04-02T09:59:06Z!joaotavora@gmail.com

* lisp/elec-pair.el (electric-pair-inhibit-if-helps-balance): Inhibit
quote pairing if point-max is inside an unterminated string.
(electric-pair--looking-at-unterminated-string-p):
Delete.
(electric-pair--in-unterminated-string-p): New function.

* test/automated/electric-tests.el (inhibit-if-strings-mismatched):
New test, change from `inhibit-only-of-next-is-mismatched'.

2 files changed, 7 insertions, 2 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index d483b0b2f9e..c94bf21fd36 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+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.
diff --git a/test/automated/electric-tests.el b/test/automated/electric-tests.el
index 184a91f5105..301130747f3 100644
--- a/test/automated/electric-tests.el
+++ b/test/automated/electric-tests.el
@@ -295,9 +295,9 @@ Should %s |%s| and point at %d"
   :bindings `((electric-pair-text-syntax-table
                . ,prog-mode-syntax-table)))
 
-(define-electric-pair-test inhibit-only-if-next-is-mismatched
+(define-electric-pair-test inhibit-if-strings-mismatched
   "\"foo\"\"bar" "\""
-  :expected-string "\"\"\"foo\"\"bar"
+  :expected-string "\"\"foo\"\"bar"
   :expected-point 2
   :test-in-strings nil
   :bindings `((electric-pair-text-syntax-table