diff options
| author | João Távora <joaotavora@gmail.com> | 2014-04-07 00:09:19 +0100 |
|---|---|---|
| committer | João Távora <joaotavora@gmail.com> | 2014-04-07 00:09:19 +0100 |
| commit | 89f20f76d8fa700d2a534834bf178ac8796d35cf (patch) | |
| tree | 8b3a2f1a6bd427320ddb303d69a25dfb87ba5b8a /lisp/elec-pair.el | |
| parent | aa5ccb01a59901cb15a25995b70a7f49d2b03b57 (diff) | |
| download | emacs-89f20f76d8fa700d2a534834bf178ac8796d35cf.tar.gz | |
Fix electric-pair-skip-whitespace with quotes in text-mode
* lisp/elec-pair.el (electric-pair-post-self-insert-function): Don't
skip whitespace for quote syntax when `electric-pair-text-pairs'
and `electric-pair-pairs' were used.
* test/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-not-without-proper-syntax):
Fixes: debbugs:17183
Diffstat (limited to 'lisp/elec-pair.el')
| -rw-r--r-- | lisp/elec-pair.el | 10 |
1 files changed, 6 insertions, 4 deletions
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 |