diff options
| author | João Távora | 2014-04-07 00:09:19 +0100 |
|---|---|---|
| committer | João Távora | 2014-04-07 00:09:19 +0100 |
| commit | 89f20f76d8fa700d2a534834bf178ac8796d35cf (patch) | |
| tree | 8b3a2f1a6bd427320ddb303d69a25dfb87ba5b8a /lisp/elec-pair.el | |
| parent | aa5ccb01a59901cb15a25995b70a7f49d2b03b57 (diff) | |
| download | emacs-89f20f76d8fa700d2a534834bf178ac8796d35cf.tar.gz emacs-89f20f76d8fa700d2a534834bf178ac8796d35cf.zip | |
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." | |||
| 485 | (funcall electric-pair-skip-self last-command-event) | 485 | (funcall electric-pair-skip-self last-command-event) |
| 486 | electric-pair-skip-self)) | 486 | electric-pair-skip-self)) |
| 487 | (save-excursion | 487 | (save-excursion |
| 488 | (when (setq skip-whitespace-info | 488 | (when (and (not (and unconditional |
| 489 | (if (functionp electric-pair-skip-whitespace) | 489 | (eq syntax ?\"))) |
| 490 | (funcall electric-pair-skip-whitespace) | 490 | (setq skip-whitespace-info |
| 491 | electric-pair-skip-whitespace)) | 491 | (if (functionp electric-pair-skip-whitespace) |
| 492 | (funcall electric-pair-skip-whitespace) | ||
| 493 | electric-pair-skip-whitespace))) | ||
| 492 | (electric-pair--skip-whitespace)) | 494 | (electric-pair--skip-whitespace)) |
| 493 | (eq (char-after) last-command-event)))) | 495 | (eq (char-after) last-command-event)))) |
| 494 | ;; This is too late: rather than insert&delete we'd want to only | 496 | ;; This is too late: rather than insert&delete we'd want to only |