From 51bd26520cd4322850e90c2266197e1b782beb76 Mon Sep 17 00:00:00 2001 From: Zhang Chiyuan Date: Tue, 10 Feb 2009 05:34:27 +0000 Subject: [PATCH] no need for a separate yas/compile-bundle-for-elpa function --- yasnippet.el | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/yasnippet.el b/yasnippet.el index fafdda7..4f4ff41 100644 --- a/yasnippet.el +++ b/yasnippet.el @@ -1040,17 +1040,6 @@ foo\"bar\\! -> \"foo\\\"bar\\\\!\"" t) "\"")) -(defun yas/compile-bundle-for-elpa - (&optional yasnippet yasnippet-bundle snippet-roots code) - "Compile bundle for ELPA, add autoloads so that ELPA can -generate code to load and activate YASnippet." - (yas/compile-bundle - yasnippet yasnippet-bundle snippet-roots - (concat (or code "") - "\n(yas/initialize-bundle)" - "\n;;;###autoload" ; break through so that won't - "(require 'yasnippet-bundle)"))) ; be treated as magic comment - (defun yas/compile-bundle (&optional yasnippet yasnippet-bundle snippet-roots code) "Compile snippets in SNIPPET-ROOTS to a single bundle file. @@ -1071,7 +1060,9 @@ all the parameters: (when (null snippet-roots) (setq snippet-roots '("snippets"))) (when (null code) - (setq code "(yas/initialize-bundle)")) + (setq code (concat "(yas/initialize-bundle)" + "\n;;;###autoload" ; break through so that won't + "(require 'yasnippet-bundle)"))) ; be treated as magic comment (let ((dirs (or (and (listp snippet-roots) snippet-roots) (list snippet-roots)))