mirror of
https://github.com/joaotavora/yasnippet.git
synced 2025-10-13 21:13:04 +00:00
* Some leftover past work in snippet loading
This commit is contained in:
parent
04c1a6e23a
commit
df72dd28d7
13
yasnippet.el
13
yasnippet.el
@ -1639,6 +1639,7 @@ TEMPLATES is a list of `yas/template'."
|
||||
(cons mode-sym parents)
|
||||
(yas/compute-major-mode-and-parents (concat directory
|
||||
"/dummy"))))
|
||||
(default-directory directory)
|
||||
(yas/ignore-filenames-as-triggers
|
||||
(or yas/ignore-filenames-as-triggers
|
||||
(file-exists-p (concat directory "/"
|
||||
@ -1807,7 +1808,7 @@ Here's the default value for all the parameters:
|
||||
" \"Initialize YASnippet and load snippets in the bundle.\"")
|
||||
(flet ((yas/define-snippets
|
||||
(mode snippets &optional parent-or-parents)
|
||||
(insert ";;; snippets for " (symbol-name mode) "\n")
|
||||
(insert ";;; snippets for " (symbol-name mode) ", subdir " (file-name-nondirectory (replace-regexp-in-string "/$" "" default-directory)) "\n")
|
||||
(let ((literal-snippets (list)))
|
||||
(dolist (snippet snippets)
|
||||
(let ((key (first snippet))
|
||||
@ -1835,9 +1836,13 @@ Here's the default value for all the parameters:
|
||||
(dolist (subdir (yas/subdirs dir))
|
||||
(let ((file (concat subdir "/.yas-setup.el")))
|
||||
(when (file-readable-p file)
|
||||
(insert ";; Supporting elisp for subdir " (file-name-nondirectory subdir) "\n\n")
|
||||
(goto-char (+ (point)
|
||||
(second (insert-file-contents file))))))
|
||||
(insert "\n;; Supporting elisp for subdir " (file-name-nondirectory subdir) "\n\n")
|
||||
(with-temp-buffer
|
||||
(insert-file-contents file)
|
||||
(replace-regexp "^;;.*$" "" nil (point-min) (point-max))
|
||||
(replace-regexp "^[\s\t]*\n\\([\s\t]*\n\\)+" "\n" nil (point-min) (point-max))
|
||||
(kill-region (point-min) (point-max)))
|
||||
(yank)))
|
||||
(yas/load-directory-1 subdir nil))))
|
||||
|
||||
(insert (pp-to-string `(yas/global-mode 1)))
|
||||
|
Loading…
x
Reference in New Issue
Block a user