2 files changed, 13 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b082670dc54..7d6436cfafc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2014-04-06  João Távora  <joaotavora@gmail.com>
+
+        * elec-pair.el (electric-pair-post-self-insert-function): Don't
+        skip whitespace when `electric-pair-text-pairs' and
+        `electric-pair-pairs' were used. syntax to
+        electric-pair--skip-whitespace. (Bug#17183)
+
 2014-04-06  Eli Zaretskii  <eliz@gnu.org>
 
         * leim/quail/ipa.el (ipa-x-sampa): Fix the character produced for
diff --git a/lisp/elec-pair.el b/lisp/elec-pair.el
index 52ad9bc0249..2c1ea7262d3 100644
--- a/lisp/elec-pair.el
+++ b/lisp/elec-pair.el
@@ -485,10 +485,12 @@ happened."
                            (funcall electric-pair-skip-self last-command-event)
                          electric-pair-skip-self))
                    (save-excursion
-                     (when (setq skip-whitespace-info
-                                 (if (functionp electric-pair-skip-whitespace)
-                                     (funcall electric-pair-skip-whitespace)
-                                   electric-pair-skip-whitespace))
+                     (when (and (not (and unconditional
+                                          (eq syntax ?\")))
+                                (setq skip-whitespace-info
+                                      (if (functionp electric-pair-skip-whitespace)
+                                          (funcall electric-pair-skip-whitespace)
+                                        electric-pair-skip-whitespace)))
                        (electric-pair--skip-whitespace))
                      (eq (char-after) last-command-event))))
          ;; This is too late: rather than insert&delete we'd want to only