diff options
Diffstat (limited to '.emacs.d/lisp/yasnippet.el')
| -rw-r--r-- | .emacs.d/lisp/yasnippet.el | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/.emacs.d/lisp/yasnippet.el b/.emacs.d/lisp/yasnippet.el index fa36be7..0d52a96 100644 --- a/.emacs.d/lisp/yasnippet.el +++ b/.emacs.d/lisp/yasnippet.el | |||
| @@ -848,18 +848,19 @@ which decides on the snippet to expand.") | |||
| 848 | (cons (if (eq mode 'fundamental-mode) () | 848 | (cons (if (eq mode 'fundamental-mode) () |
| 849 | (append (cdr ap) '(fundamental-mode))) | 849 | (append (cdr ap) '(fundamental-mode))) |
| 850 | extras)))) | 850 | extras)))) |
| 851 | (cons mode | 851 | (delete-dups |
| 852 | (yas--merge-ordered-lists | 852 | (cons mode |
| 853 | (mapcar #'yas--all-parents | 853 | (yas--merge-ordered-lists |
| 854 | (remq nil | 854 | (mapcar #'yas--all-parents |
| 855 | `(,(or (get mode 'derived-mode-parent) | 855 | (remq nil |
| 856 | ;; Consider `fundamental-mode' | 856 | `(,(or (get mode 'derived-mode-parent) |
| 857 | ;; as ultimate ancestor. | 857 | ;; Consider `fundamental-mode' |
| 858 | 'fundamental-mode) | 858 | ;; as ultimate ancestor. |
| 859 | ,(let ((alias (symbol-function mode))) | 859 | 'fundamental-mode) |
| 860 | (when (symbolp alias) alias)) | 860 | ,(let ((alias (symbol-function mode))) |
| 861 | ,@(get mode 'derived-mode-extra-parents) | 861 | (when (symbolp alias) alias)) |
| 862 | ,@(gethash mode yas--parents))))))))) | 862 | ,@(get mode 'derived-mode-extra-parents) |
| 863 | ,@(gethash mode yas--parents)))))))))) | ||
| 863 | (dolist (parent all-parents) | 864 | (dolist (parent all-parents) |
| 864 | (cl-pushnew mode (get parent 'yas--cached-children))) | 865 | (cl-pushnew mode (get parent 'yas--cached-children))) |
| 865 | (put mode 'yas--all-parents all-parents))))) | 866 | (put mode 'yas--all-parents all-parents))))) |