From 6e4cadd26147ca192b538d415174c82a7cd56ed6 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Mon, 27 Jul 2015 15:10:59 +0200
Subject: [PATCH] Fix add-yas-minor-mode!

---
 core/lib/macros-yasnippet.el | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/core/lib/macros-yasnippet.el b/core/lib/macros-yasnippet.el
index 4e0233843..aad470934 100644
--- a/core/lib/macros-yasnippet.el
+++ b/core/lib/macros-yasnippet.el
@@ -2,16 +2,15 @@
 ;; for ../core-yasnippet.el
 
 ;;;###autoload
-(defmacro add-yas-minor-mode! (&rest modes)
+(defmacro add-yas-minor-mode! (mode)
   "Register minor MODES in yasnippet."
   `(after! yasnippet
      (when (boundp 'yas-extra-modes)
-       ,@(mapcar (lambda (mode)
-                   `(after! ,(cadr mode)
-                      (if (symbol-value ,mode)
-                          (yas-activate-extra-mode ,mode)
-                        (setq yas-extra-modes (delq ,mode yas-extra-modes)))))
-                 modes))))
+       (add-hook ',(intern (concat (symbol-name (cadr mode)) "-hook"))
+                 (lambda ()
+                   (if (symbol-value ,mode)
+                       (yas-activate-extra-mode ,mode)
+                     (yas-deactivate-extra-mode ,mode)))))))
 
 (provide 'macros-yasnippet)
 ;;; macros-yasnippet.el ends here