From e9200d1baa6a6c86503028c7d15696f6dddf45b7 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sat, 12 Jul 2014 22:49:18 +0100
Subject: Emacs: Simplify PHP-SQL MMM configuration

---
 tag-emacs/emacs.d/init.el | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/tag-emacs/emacs.d/init.el b/tag-emacs/emacs.d/init.el
index bc131f59..8fd1b20a 100644
--- a/tag-emacs/emacs.d/init.el
+++ b/tag-emacs/emacs.d/init.el
@@ -1097,20 +1097,13 @@
 
 (req-package mmm-auto
   :config (progn
-            (defvar php-sql-mmm-submode-enabled nil)
-            (defun php-sql-mmm-submode ()
-              "Provides a very minimal embedding of SQL in PHP, via mmm-mode."
-              (interactive)
-              (when (not php-sql-mmm-submode-enabled)
-                (set-face-background 'mmm-default-submode-face nil)
-                (mmm-add-classes
-                 '((php-sql
-                    :submode sql-mode
-                    :front "\\($\\(sql\\|query\\)\\s-*=\\s-*[\"']\\|<<<SQL\\)"
-                    :back "\\([\"']\\|SQL\\);?"
-                    :face mmm-code-submode-face)))
-                (mmm-add-mode-ext-class 'php-mode "\\.php$" 'php-sql)
-                (setq php-sql-mmm-submode-enabled t)))
+            (mmm-add-classes
+             '((php-sql
+                :submode sql-mode
+                :front "\\($\\(sql\\|query\\)\\s-*=\\s-*[\"']\\|<<<SQL\\)[\r\n]+"
+                :back "\\([\"']\\|SQL\\);?"
+                :face mmm-code-submode-face)))
+            (mmm-add-mode-ext-class 'php-mode "\\.php$" 'php-sql)
             (mmm-add-classes
              '((markdown-toml
                 :submode toml-mode
-- 
cgit 1.4.1