From da8aa0c8213e47e4d4327ea9e3bdf0c97769961b Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Wed, 8 May 2013 11:29:34 +0100
Subject: Emacs: move mumamo workaround into nxhtml's use-package form

---
 emacs/init.el | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'emacs')

diff --git a/emacs/init.el b/emacs/init.el
index 6b4fda2..76a7ad7 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -1013,18 +1013,15 @@ Works with: arglist-cont-nonempty, arglist-close."
   :mode (("\\.php\\'" . html-mumamo-mode))
   :idle (load (expand-file-name "nxhtml/autostart" *el-get-dir*))
   :config (progn
+            (when (and (equal emacs-major-version 24)
+                       (> emacs-minor-version 1))
+              (setq mumamo-per-buffer-local-vars
+                    (delq 'buffer-file-name mumamo-per-buffer-local-vars)))
             (setq mumamo-chunk-coloring 4
                   nxhtml-skip-welcome t
                   nxhtml-autoload-web nil)
             (nxhtml-menu-mode 0)))
 
-(when (and (equal emacs-major-version 24)
-           (equal emacs-minor-version 2))
-  (use-package mumamo
-    :defer t
-    :config (progn (setq mumamo-per-buffer-local-vars
-                         (delq 'buffer-file-name mumamo-per-buffer-local-vars)))))
-
 (use-package php-mode
   :mode ("\\.php\\'" . php-mode)
   :config (progn
-- 
cgit 1.4.1