ld/yasnippet
1
0
Fork 0
mirror of https://github.com/joaotavora/yasnippet.git synced 2025-10-13 13:13:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

yas/load-directory: bugfix: yas/define-parents must be called earlier on.

Browse Source
This commit is contained in:
João Távora 2012-04-22 16:34:57 +01:00
parent d317a408c3
commit 26c311ee8a
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
yasnippet.el
View File

@ -181,6 +181,7 @@ as the default for storing the user's new snippets."
(equal old new)) (equal old new))
(yas/reload-all))))) (yas/reload-all)))))
(defun yas/snippet-dirs () (defun yas/snippet-dirs ()
"Returns `yas/snippet-dirs' (which see) as a list."
(if (listp yas/snippet-dirs) yas/snippet-dirs (list yas/snippet-dirs))) (if (listp yas/snippet-dirs) yas/snippet-dirs (list yas/snippet-dirs)))
(defvaralias 'yas/root-directory 'yas/snippet-dirs) (defvaralias 'yas/root-directory 'yas/snippet-dirs)
@ -1621,6 +1622,7 @@ Below TOP-LEVEL-DIR each directory is a mode name."
(concat dir "/dummy"))) (concat dir "/dummy")))
(mode-sym (car major-mode-and-parents)) (mode-sym (car major-mode-and-parents))
(parents (cdr major-mode-and-parents))) (parents (cdr major-mode-and-parents)))
(yas/define-parents mode-sym parents)
(let ((form `(yas/load-directory-1 ,dir (let ((form `(yas/load-directory-1 ,dir
',mode-sym ',mode-sym
',parents))) ',parents)))
@ -1640,7 +1642,6 @@ Below TOP-LEVEL-DIR each directory is a mode name."
(yas/load-directory-2 directory mode-sym parents)))) (yas/load-directory-2 directory mode-sym parents))))
(defun yas/load-directory-2 (directory mode-sym parents) (defun yas/load-directory-2 (directory mode-sym parents)
(yas/define-parents mode-sym parents)
;; Load .yas-setup.el files wherever we find them ;; Load .yas-setup.el files wherever we find them
;; ;;
(yas/load-yas-setup-file (expand-file-name ".yas-setup" directory)) (yas/load-yas-setup-file (expand-file-name ".yas-setup" directory))
@ -1736,10 +1737,6 @@ This works by stubbing a few functions, then calling
(when (file-exists-p elfile) (when (file-exists-p elfile)
(insert ";;; .yas-setup.el support file if any:\n;;;\n") (insert ";;; .yas-setup.el support file if any:\n;;;\n")
(insert-file-contents elfile)))) (insert-file-contents elfile))))
(yas/define-parents
(mode parents)
(insert ";;; Parent definitions:\n;;;\n")
(insert (pp-to-string `(yas/define-parents ',mode ',parents))))
(yas/define-snippets (yas/define-snippets
(mode snippets) (mode snippets)
(insert ";;; Snippet definitions:\n;;;\n") (insert ";;; Snippet definitions:\n;;;\n")