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

Sligthly saner `yas/load-directory-1'

Browse Source
This commit is contained in:
Joao Tavora 2012-03-06 14:35:54 +00:00
parent b392dd3726
commit fe6351b18f
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
yasnippet.el
View File

@ -1601,7 +1601,7 @@ TEMPLATES is a list of `yas/template'."
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Loading snippets from files ;; Loading snippets from files
;; ;;
(defun yas/load-directory-1 (directory &optional mode-sym parents no-compiled-snippets) (defun yas/load-directory-1 (directory mode-sym parents &optional no-compiled-snippets)
"Recursively load snippet templates from DIRECTORY." "Recursively load snippet templates from DIRECTORY."
(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
@ -1610,11 +1610,7 @@ TEMPLATES is a list of `yas/template'."
(if (and (not no-compiled-snippets) (if (and (not no-compiled-snippets)
(load (expand-file-name ".yas-compiled-snippets" directory) '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* ((default-directory directory)
(cons mode-sym parents)
(yas/compute-major-mode-and-parents (concat directory
"/dummy"))))
(default-directory directory)
(snippet-defs nil)) (snippet-defs nil))
;; load the snippet files ;; load the snippet files
;; ;;
@ -1626,15 +1622,15 @@ TEMPLATES is a list of `yas/template'."
snippet-defs)))) snippet-defs))))
(when (or snippet-defs (when (or snippet-defs
(cdr major-mode-and-parents)) (cdr major-mode-and-parents))
(yas/define-snippets (car major-mode-and-parents) (yas/define-snippets mode-sym
snippet-defs snippet-defs
(cdr major-mode-and-parents))) parents))
;; now recurse to a lower level ;; now recurse to a lower level
;; ;;
(dolist (subdir (yas/subdirs directory)) (dolist (subdir (yas/subdirs directory))
(yas/load-directory-1 subdir (yas/load-directory-1 subdir
(car major-mode-and-parents) mode-sym
(cdr major-mode-and-parents) parents
t)))))) t))))))
(defun yas/load-directory (top-level-dir) (defun yas/load-directory (top-level-dir)
@ -1647,7 +1643,11 @@ Below TOP-LEVEL-DIR., each directory is a mode name."
(unless yas/snippet-dirs (unless yas/snippet-dirs
(setq yas/snippet-dirs top-level-dir)) (setq yas/snippet-dirs top-level-dir))
(dolist (dir (yas/subdirs top-level-dir)) (dolist (dir (yas/subdirs top-level-dir))
(yas/load-directory-1 dir)) (let ((major-mode-and-parents (yas/compute-major-mode-and-parents
(concat dir "/dummy"))))
(yas/load-directory-1 dir
(car major-mode-and-parents)
(cdr major-mode-and-parents))))
(when (interactive-p) (when (interactive-p)
(message "[yas] Loaded snippets from %s." top-level-dir))) (message "[yas] Loaded snippets from %s." top-level-dir)))