branch: master
commit c712ad4fe0973f3be5dbbf419505a722f75a8124
Author: mas <mas>
Commit: mas <mas>
Added flags telling which faces to use for which regions.
---
mmm-mason.el | 26 +++++++++++++++++++++-----
mmm-rpm.el | 3 ++-
mmm-sample.el | 13 +++++++++++--
3 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/mmm-mason.el b/mmm-mason.el
index 22341db..d2a24ac 100644
--- a/mmm-mason.el
+++ b/mmm-mason.el
@@ -3,7 +3,7 @@
;; Copyright (C) 2000 by Michael Abraham Shulman
;; Author: Michael Abraham Shulman <[email protected]>
-;; Version: $Id: mmm-mason.el,v 1.9 2000/07/12 05:45:29 mas Exp $
+;; Version: $Id: mmm-mason.el,v 1.10 2001/01/11 00:56:30 mas Exp $
;;{{{ GPL
@@ -85,6 +85,7 @@ Saves the name of the tag matched.")
_ "\n" @ "</%text>" @)))
(mason-doc
:submode text-mode
+ :face mmm-comment-submode-face
:front "<%doc>"
:back "</%doc>"
:face nil
@@ -92,6 +93,12 @@ Saves the name of the tag matched.")
_ "\n" @ "</%doc>" @)))
(mason-perl
:submode ,mmm-mason-perl-mode
+ :match-face (("<%perl>" . mmm-code-submode-face)
+ ("<%init>" . mmm-init-submode-face)
+ ("<%cleanup>" . mmm-cleanup-submode-face)
+ ("<%once>" . mmm-init-submode-face)
+ ("<%filter>" . mmm-special-submode-face)
+ ("<%shared>" . mmm-init-submode-face))
:front ,mmm-mason-perl-tags-regexp
:back "</%~1>"
:save-matches 1
@@ -106,6 +113,7 @@ Saves the name of the tag matched.")
(?s mason-<%shared> ?, . "shared")))
(mason-pseudo-perl
:submode ,mmm-mason-perl-mode
+ :face mmm-declaration-submode-face
:front ,mmm-mason-pseudo-perl-tags-regexp
:back "</%~1>"
:save-matches 1
@@ -117,6 +125,7 @@ Saves the name of the tag matched.")
(?r mason-<%attr> ?. . "attr")))
(mason-inline
:submode ,mmm-mason-perl-mode
+ :face mmm-output-submode-face
:front "<%"
:front-verify mmm-mason-verify-inline
:back "%>"
@@ -124,19 +133,26 @@ Saves the name of the tag matched.")
(?5 mason-<%-%> ?% . nil)))
(mason-call
:submode ,mmm-mason-perl-mode
+ :face mmm-special-submode-face
:front "<&"
:back "&>"
:insert ((?& mason-<&-&> nil @ "<&" @ " " _ " " @ "&>" @)
(?7 mason-<&-&> ?% . nil)))
+ (mason-one-line-comment
+ :submode text-mode
+ :face mmm-comment-submode-face
+ :front "^%#"
+ :back "\n"
+ :insert ((?# mason-%-comment nil (mmm-mason-start-line)
+ @ "%" @ "# " _ @ '(mmm-mason-end-line) "\n" @)
+ (?3 mason-%-comment ?# . nil)))
(mason-one-line
:submode ,mmm-mason-perl-mode
+ :face mmm-code-submode-face
:front "^%"
:back "\n"
:insert ((return mason-%-line nil (mmm-mason-start-line)
- @ "%" @ " " _ @ '(mmm-mason-end-line) "\n" @)
- (?# mason-%-comment nil (mmm-mason-start-line)
- @ "%" @ "# " _ @ '(mmm-mason-end-line) "\n" @)
- (?3 mason-%-comment ?# . nil)))))
+ @ "%" @ " " _ @ '(mmm-mason-end-line) "\n" @)))))
;;}}}
;;{{{ One-line Sections
diff --git a/mmm-rpm.el b/mmm-rpm.el
index 24fb941..1fe1bab 100644
--- a/mmm-rpm.el
+++ b/mmm-rpm.el
@@ -3,7 +3,7 @@
;; Copyright (C) 2000 by Marcus Harnisch <[email protected]>
;; Author: Marcus Harnisch <[email protected]>
-;; Version: $Id: mmm-rpm.el,v 1.2 2000/08/21 23:25:52 mas Exp $
+;; Version: $Id: mmm-rpm.el,v 1.3 2001/01/11 00:56:30 mas Exp $
;;{{{ GPL
@@ -66,6 +66,7 @@
'rpm
`((rpm-sh
:submode sh-mode
+ :face mmm-code-submode-face
;; match tags that starts sh-script region
:front ,mmm-rpm-sh-start-regexp
;; match end of buffer or next tag that ends sh-script region
diff --git a/mmm-sample.el b/mmm-sample.el
index eea1b26..368005a 100644
--- a/mmm-sample.el
+++ b/mmm-sample.el
@@ -3,7 +3,7 @@
;; Copyright (C) 2000 by Michael Abraham Shulman
;; Author: Michael Abraham Shulman <[email protected]>
-;; Version: $Id: mmm-sample.el,v 1.10 2000/08/01 01:54:03 mas Exp $
+;; Version: $Id: mmm-sample.el,v 1.11 2001/01/11 00:56:30 mas Exp $
;;{{{ GPL
@@ -40,6 +40,7 @@
(mmm-add-classes
'((embedded-css
:submode css-mode
+ :face mmm-declaration-submode-face
:front "<style[^>]*>"
:back "</style>")))
@@ -59,6 +60,7 @@ otherwise `c++-mode'. Some people prefer `c++-mode'
regardless.")
'html-js
`((js-tag
:submode ,mmm-javascript-mode
+ :face mmm-code-submode-face
:front "<script\[^>\]*>"
:back"</script>"
:insert ((?j js-tag nil @ "<script language=\"JavaScript\">"
@@ -66,6 +68,7 @@ otherwise `c++-mode'. Some people prefer `c++-mode'
regardless.")
)
(js-inline
:submode ,mmm-javascript-mode
+ :face mmm-code-submode-face
:front "on\w+=\""
:back "\"")))
@@ -148,9 +151,14 @@ Usually either `perl-mode' or `cperl-mode'. The default is
:front "\\[\\([-\\+!\\*\\$]\\)"
:back "~1\\]"
:save-matches 1
+ :match-face (("[+" . mmm-output-submode-face)
+ ("[-" . mmm-code-submode-face)
+ ("[!" . mmm-init-submode-face)
+ ("[*" . mmm-code-submode-face)
+ ("[$" . mmm-special-submode-face))
:insert ((?p embperl "Region Type (Character): " @ "[" str
@ " " _ " " @ str "]" @)
- (?+ embperl+ ?p . "+")
+ (?+ embperl+ ?p . "+")
(?- embperl- ?p . "-")
(?! embperl! ?p . "!")
(?* embperl* ?p . "*")
@@ -159,6 +167,7 @@ Usually either `perl-mode' or `cperl-mode'. The default is
)
(embperl-comment
:submode text-mode
+ :face mmm-comment-submode-face
:front "\\[#"
:back "#\\]"
:insert ((?# embperl-comment nil @ "[#" @ " " _ " " @ "#]" @))
