diff options
| author | Simeon Simeonov | 2017-06-26 14:23:42 +0200 |
|---|---|---|
| committer | Simeon Simeonov | 2017-06-26 14:23:42 +0200 |
| commit | d3897e6921d636fca903af39cc1516fe97aa8560 (patch) | |
| tree | b408395d7c2d99d056840794063eb030a6943bb8 /.emacs.d | |
| parent | 24bc1ad5a9a4f78410ad65492a53329f759408d7 (diff) | |
Update yasnippet
Diffstat (limited to '.emacs.d')
| -rw-r--r-- | .emacs.d/lisp/yasnippet.el | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/.emacs.d/lisp/yasnippet.el b/.emacs.d/lisp/yasnippet.el index 798e49e..69f7381 100644 --- a/.emacs.d/lisp/yasnippet.el +++ b/.emacs.d/lisp/yasnippet.el | |||
| @@ -526,6 +526,12 @@ conditions. | |||
| 526 | (const :tag "Disable all snippet expansion" nil) | 526 | (const :tag "Disable all snippet expansion" nil) |
| 527 | sexp)) | 527 | sexp)) |
| 528 | 528 | ||
| 529 | (defcustom yas-overlay-priority 100 | ||
| 530 | "Priority to use for yasnippets overlays. | ||
| 531 | This is useful to control whether snippet navigation bindings | ||
| 532 | override bindings from other packages (e.g., `company-mode')." | ||
| 533 | :type 'integer) | ||
| 534 | |||
| 529 | 535 | ||
| 530 | ;;; Internal variables | 536 | ;;; Internal variables |
| 531 | 537 | ||
| @@ -3500,7 +3506,7 @@ holds the keymap." | |||
| 3500 | nil | 3506 | nil |
| 3501 | t))) | 3507 | t))) |
| 3502 | (overlay-put overlay 'keymap yas-keymap) | 3508 | (overlay-put overlay 'keymap yas-keymap) |
| 3503 | (overlay-put overlay 'priority 100) | 3509 | (overlay-put overlay 'priority yas-overlay-priority) |
| 3504 | (overlay-put overlay 'yas--snippet snippet) | 3510 | (overlay-put overlay 'yas--snippet snippet) |
| 3505 | overlay)) | 3511 | overlay)) |
| 3506 | 3512 | ||
| @@ -3556,7 +3562,7 @@ Move the overlay, or create it if it does not exit." | |||
| 3556 | (make-overlay (yas--field-start field) | 3562 | (make-overlay (yas--field-start field) |
| 3557 | (yas--field-end field) | 3563 | (yas--field-end field) |
| 3558 | nil nil t)) | 3564 | nil nil t)) |
| 3559 | (overlay-put yas--active-field-overlay 'priority 100) | 3565 | (overlay-put yas--active-field-overlay 'priority yas-overlay-priority) |
| 3560 | (overlay-put yas--active-field-overlay 'face 'yas-field-highlight-face) | 3566 | (overlay-put yas--active-field-overlay 'face 'yas-field-highlight-face) |
| 3561 | (overlay-put yas--active-field-overlay 'yas--snippet snippet) | 3567 | (overlay-put yas--active-field-overlay 'yas--snippet snippet) |
| 3562 | (overlay-put yas--active-field-overlay 'modification-hooks '(yas--on-field-overlay-modification)) | 3568 | (overlay-put yas--active-field-overlay 'modification-hooks '(yas--on-field-overlay-modification)) |
