emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move ycm-smartparens fix to core-yasnippet.el

Browse source
This commit is contained in:
Henrik Lissner 2015-12-27 02:51:05 -05:00
parent 926544227f
commit 284b676934
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/core-editor.el
View file

@ -218,11 +218,7 @@ enable multiple minor modes for the same regexp.")
(sp-local-pair "{{!--" "--}}" :post-handlers '(("||\n[i]" "RET") ("| " "SPC"))) (sp-local-pair "{{!--" "--}}" :post-handlers '(("||\n[i]" "RET") ("| " "SPC")))
(sp-local-pair "<%" "%>" :post-handlers '(("||\n[i]" "RET") ("| " "SPC"))) (sp-local-pair "<%" "%>" :post-handlers '(("||\n[i]" "RET") ("| " "SPC")))
(sp-local-pair "{!!" "!!}" :post-handlers '(("||\n[i]" "RET") ("| " "SPC"))) (sp-local-pair "{!!" "!!}" :post-handlers '(("||\n[i]" "RET") ("| " "SPC")))
(sp-local-pair "{#" "#}" :post-handlers '(("||\n[i]" "RET") ("| " "SPC")))) (sp-local-pair "{#" "#}" :post-handlers '(("||\n[i]" "RET") ("| " "SPC")))))
;; (after! yasnippet
;; (advice-add 'yas-expand :before 'sp-remove-active-pair-overlay))
)
(use-package help-fns+ ; Improved help commands (use-package help-fns+ ; Improved help commands
:commands (describe-buffer describe-command describe-file :commands (describe-buffer describe-command describe-file

5
core/core-yasnippet.el
View file

@ -70,7 +70,10 @@
(defadvice yas-expand-snippet (around yas-expand-snippet-visual-line activate) (defadvice yas-expand-snippet (around yas-expand-snippet-visual-line activate)
(when (narf/evil-visual-line-state-p) (when (narf/evil-visual-line-state-p)
(ad-set-arg 2 (1- (ad-get-arg 2)))) ad-do-it) (ad-set-arg 2 (1- (ad-get-arg 2)))) ad-do-it)
)
;; Fix an issue with smartparens' keybindings interfering with yasnippet keybindings.
(after! yasnippet
(advice-add 'yas-expand :before 'sp-remove-active-pair-overlay)))
(provide 'core-yasnippet) (provide 'core-yasnippet)
;;; core-yasnippet.el ends here ;;; core-yasnippet.el ends here