mirror of
https://github.com/joaotavora/yasnippet.git
synced 2025-10-13 13:13:03 +00:00
* yasnippet.el (yas--all-parents): Don't add fundamental-mode
to itself
Rename `yas--all-children` to `yas--cached-children` since it doesn't contain "all" children.
This commit is contained in:
parent
d7f55c7501
commit
8ce506e32f
11
yasnippet.el
11
yasnippet.el
@ -829,7 +829,9 @@ which decides on the snippet to expand.")
|
||||
(gethash parent yas--parents))))
|
||||
ap)))
|
||||
(yas--merge-ordered-lists
|
||||
(cons (append ap '(fundamental-mode)) extras)))
|
||||
(cons (if (eq (car ap) 'fundamental-mode) ap
|
||||
(append ap '(fundamental-mode)))
|
||||
extras)))
|
||||
(cons mode
|
||||
(yas--merge-ordered-lists
|
||||
(mapcar #'yas--all-parents
|
||||
@ -842,7 +844,7 @@ which decides on the snippet to expand.")
|
||||
(when (symbolp alias) alias))
|
||||
,@(gethash mode yas--parents)))))))))
|
||||
(dolist (parent all-parents)
|
||||
(cl-pushnew mode (get parent 'yas--all-children)))
|
||||
(cl-pushnew mode (get parent 'yas--cached-children)))
|
||||
(put mode 'yas--all-parents all-parents)))))
|
||||
|
||||
(defun yas--modes-to-activate (&optional mode)
|
||||
@ -1857,8 +1859,9 @@ the current buffers contents."
|
||||
|
||||
(defun yas--define-parents (mode parents)
|
||||
"Add PARENTS to the list of MODE's parents."
|
||||
(dolist (child (get mode 'yas--all-children))
|
||||
(put child 'yas--all-parents nil)) ;Flush the cache for all children.
|
||||
(dolist (child (get mode 'yas--cached-children))
|
||||
(put child 'yas--all-parents nil)) ;Flush the cache for children.
|
||||
(put 'mode 'yas--cached-children nil)
|
||||
(puthash mode (cl-remove-duplicates
|
||||
(append parents
|
||||
(gethash mode yas--parents)))
|
||||
|
Loading…
x
Reference in New Issue
Block a user