Load correct .yas-setup and .yas-compiled-snippets file when loading a snippet dir

This commit is contained in:
João Távora 2012-02-27 02:34:02 +00:00
parent 7ab75027cc
commit 893a9b3594

View File

@ -1606,9 +1606,9 @@ TEMPLATES is a list of `yas/template'."
(unless (file-exists-p (concat directory "/" ".yas-skip")) (unless (file-exists-p (concat directory "/" ".yas-skip"))
;; Load .yas-setup.el files wherever we find them ;; Load .yas-setup.el files wherever we find them
;; ;;
(load ".yas-setup" 'noerror) (load (expand-file-name ".yas-setup" directory) 'noerror)
(if (and (not no-compiled-snippets) (if (and (not no-compiled-snippets)
(load ".yas-compiled-snippets" 'noerror)) (load (expand-file-name ".yas-compiled-snippets" directory) 'noerror))
(message "Loading much faster .yas-compiled-snippets from %s" directory) (message "Loading much faster .yas-compiled-snippets from %s" directory)
(let* ((major-mode-and-parents (if mode-sym (let* ((major-mode-and-parents (if mode-sym
(cons mode-sym parents) (cons mode-sym parents)