From aa23b3c5c163bc0eb8ab96d2539db6a6a9cc34aa Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 4 Mar 2017 20:51:35 -0500 Subject: [PATCH] smartparens: more conservative single-quote autopairing --- core/core-editor.el | 2 +- modules/lang/python/config.el | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/core-editor.el b/core/core-editor.el index faca0482e..28707ebea 100644 --- a/core/core-editor.el +++ b/core/core-editor.el @@ -122,7 +122,7 @@ (add-hook 'evil-replace-state-entry-hook 'turn-off-smartparens-mode) (add-hook 'evil-replace-state-exit-hook 'turn-on-smartparens-mode) ;; Auto-close more conservatively - (sp-pair "'" nil :unless '(sp-point-after-word-p)) + (sp-pair "'" nil :unless '(sp-point-before-word-p sp-point-after-word-p sp-point-before-same-p)) (sp-pair "\"" nil :unless '(sp-point-before-word-p sp-point-after-word-p sp-point-before-same-p)) (sp-pair "{" nil :post-handlers '(("||\n[i]" "RET") ("| " " ")) :unless '(sp-point-before-word-p sp-point-before-same-p)) diff --git a/modules/lang/python/config.el b/modules/lang/python/config.el index 2ab6c666e..458574eb4 100644 --- a/modules/lang/python/config.el +++ b/modules/lang/python/config.el @@ -19,7 +19,10 @@ :config (set! :repl 'python-mode '+python/repl) - (define-key python-mode-map (kbd "DEL") nil)) ; interferes with smartparens + (define-key python-mode-map (kbd "DEL") nil) ; interferes with smartparens + + (sp-with-modes 'python-mode + (sp-local-pair "'" nil :unless '(sp-point-before-word-p sp-point-after-word-p sp-point-before-same-p)))) (def-package! anaconda-mode