summary refs log tree commit diff stats
path: root/emacs
diff options
context:
space:
mode:
authorAlan Pearce2013-05-08 11:29:34 +0100
committerAlan Pearce2013-05-08 11:30:28 +0100
commitda8aa0c8213e47e4d4327ea9e3bdf0c97769961b (patch)
tree92a0d8801c27b823862642c71f606a60c10f5303 /emacs
parent7b4a89e95876cea8c283f018b079d72e4d8ed2c0 (diff)
downloadnixfiles-da8aa0c8213e47e4d4327ea9e3bdf0c97769961b.tar.lz
nixfiles-da8aa0c8213e47e4d4327ea9e3bdf0c97769961b.tar.zst
nixfiles-da8aa0c8213e47e4d4327ea9e3bdf0c97769961b.zip
Emacs: move mumamo workaround into nxhtml's use-package form
Diffstat (limited to 'emacs')
-rw-r--r--emacs/init.el11
1 files changed, 4 insertions, 7 deletions
diff --git a/emacs/init.el b/emacs/init.el
index 6b4fda20..76a7ad76 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