mirror of
https://github.com/joaotavora/yasnippet.git
synced 2025-10-14 05:23:04 +00:00
Don't check this-command in yas-not-string-or-comment-condition
Since we now check conditions in conditional keybindings, it can be evaluated before 'this-command' has been assigned. * yasnippet.el (yas-not-string-or-comment-condition): Remove check of 'this-command'.
This commit is contained in:
parent
6a3619b4f2
commit
7612bc1b70
@ -481,10 +481,8 @@ Attention: These hooks are not run when exiting nested/stacked snippet expansion
|
|||||||
"Hooks to run just before expanding a snippet.")
|
"Hooks to run just before expanding a snippet.")
|
||||||
|
|
||||||
(defconst yas-not-string-or-comment-condition
|
(defconst yas-not-string-or-comment-condition
|
||||||
'(if (and (let ((ppss (syntax-ppss)))
|
'(if (let ((ppss (syntax-ppss)))
|
||||||
(or (nth 3 ppss) (nth 4 ppss)))
|
(or (nth 3 ppss) (nth 4 ppss)))
|
||||||
(memq this-command '(yas-expand yas-expand-from-trigger-key
|
|
||||||
yas-expand-from-keymap)))
|
|
||||||
'(require-snippet-condition . force-in-comment)
|
'(require-snippet-condition . force-in-comment)
|
||||||
t)
|
t)
|
||||||
"Disables snippet expansion in strings and comments.
|
"Disables snippet expansion in strings and comments.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user