[nongnu] elpa/jade-mode 6a3a936de8 112/128: Merge pull request #57 from tjefferson08/makefile-and-mixin-cleanup

[ELPA Syncer]

branch: elpa/jade-mode
commit 6a3a936de8fa7600da38e674316f04331dc504d5
Merge: ecc1253196 fe250570ee
Author: Travis Jefferson <tjefferson@signpost.com>
Commit: Travis Jefferson <tjefferson@signpost.com>

    Merge pull request #57 from tjefferson08/makefile-and-mixin-cleanup
    
    Makefile and mixin cleanup
---
 .travis.yml  | 8 +++++++-
 Makefile     | 3 +++
 example.jade | 3 ++-
 jade-mode.el | 3 ++-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a6c03325f0..b218d954a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,10 @@
 language: generic
+
 env:
   global:
     - CURL=curl -fsSkL --retry 9 --retry-delay 9
   matrix:
-    - EMACS=emacs AKA=emacs23
+#    - EMACS=emacs AKA=emacs23
     - EMACS=emacs24
 #    - EMACS=emacs-snapshot
 # matrix:
@@ -13,6 +14,11 @@ before_install:
   - sudo add-apt-repository -y ppa:cassou/emacs
   - sudo apt-get update -qq
   - sudo apt-get install -qq $EMACS
+  - curl -fsSL https://raw.githubusercontent.com/cask/cask/master/go | python
+  - export PATH="/home/travis/.cask/bin:$PATH"
+  - cask install
+  - which cask
+  - cask --version
 install:
   - if test $EMACS = emacs; then
       $CURL 
https://raw.githubusercontent.com/ohler/ert/fb3c278d/lisp/emacs-lisp/ert.el -o 
ert.el;
diff --git a/Makefile b/Makefile
index 6d1c66ddc9..f7d646ba8c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,7 @@
+.PHONY: test
+
 test:
        cask exec ert-runner -l jade-mode.el
+
 # Local Variables:
 # indent-tabs-mode: t
diff --git a/example.jade b/example.jade
index 1795a304e0..c4b5d9e37e 100644
--- a/example.jade
+++ b/example.jade
@@ -28,7 +28,8 @@ html(lang="en", class = ['classOne', 'classTwo'].join(','))
           span this one shouldn't higlight strings or... .other #things if else
           | this one shouldn't highlight strings, and the same goes for 
.keywords #ok ?
         div#paren.content.example(style = 'float: left;') Content .here 
#should be plain if for
-        +help("if this is .bolded #that's bad, we want a string","a second arg 
or else"); 
+        +helpMe("if this is .bolded #that's bad, we want a string","a second 
arg or else");
+        //- +mixIn('do not highlight mixins in comment blocks')
         div.examples#javascript
           - var a = 1;
           - var helperFunction = function (a) { return (a === 1 ? 'singular' : 
'plural'); };
diff --git a/jade-mode.el b/jade-mode.el
index 69505357fe..928f2648d4 100644
--- a/jade-mode.el
+++ b/jade-mode.el
@@ -89,8 +89,9 @@
     (,jade-keywords . font-lock-keyword-face) ;; keywords
     (,jade-id-re . font-lock-variable-name-face) ;; id
     (,jade-class-re . font-lock-type-face) ;; class name
-    ("\\(-?//.*\\)" 1 font-lock-comment-face t) ;; jade block comments
     (,jade-tag-re . font-lock-function-name-face)
+    (,jade-mixin-re 0 font-lock-constant-face t)
+    ("\\(-?//.*\\)" 1 font-lock-comment-face t) ;; jade block comments
     ;; tag name
 
     ;; remove highlighting from literal content following tag/class/id