emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] master 7975003 18/79: Pass ignored test with recursive colorizer.


From: Jackson Ray Hamilton
Subject: [elpa] master 7975003 18/79: Pass ignored test with recursive colorizer.
Date: Sun, 14 Jun 2015 00:05:21 +0000

branch: master
commit 7975003d23bce77510e05b620cec4810262c5443
Author: Jackson Ray Hamilton <address@hidden>
Commit: Jackson Ray Hamilton <address@hidden>

    Pass ignored test with recursive colorizer.
---
 context-coloring.el           |    7 +++++--
 test/context-coloring-test.el |   10 +++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/context-coloring.el b/context-coloring.el
index 5b5fb08..ec8cb4a 100644
--- a/context-coloring.el
+++ b/context-coloring.el
@@ -403,8 +403,11 @@ generated by `js2-mode'."
   "\\`[^&:]")
 
 (defconst context-coloring-ignored-word-regexp
-  (concat "\\`[&:-+]?[0-9]\\|" (context-coloring-exact-or-regexp
-                                '("t" "nil" "." "?"))))
+  (context-coloring-join (list "\\`[-+]?[0-9]"
+                               "\\`[&:].+"
+                               (context-coloring-exact-or-regexp
+                                '("t" "nil" "." "?")))
+                         "\\|"))
 
 (defconst context-coloring-WORD-CODE 2)
 (defconst context-coloring-SYMBOL-CODE 3)
diff --git a/test/context-coloring-test.el b/test/context-coloring-test.el
index 2d8cfc9..061ce28 100644
--- a/test/context-coloring-test.el
+++ b/test/context-coloring-test.el
@@ -1119,11 +1119,11 @@ ssssssssssss0"))
 ;;   :before (lambda ()
 ;;             (setq context-coloring-syntactic-strings t)))
 
-;; (context-coloring-test-deftest-emacs-lisp ignored
-;;   (lambda ()
-;;     (context-coloring-test-assert-coloring "
-;; (xxxxx x ()
-;;   (x x 1 11 11 111 11 1 111 (1 1 1)))")))
+(context-coloring-test-deftest-emacs-lisp ignored
+  (lambda ()
+    (context-coloring-test-assert-coloring "
+(xxxxx x ()
+  (x x 1 11 11 111 11 1 111 (1 1 1)))")))
 
 ;; (context-coloring-test-deftest-emacs-lisp let
 ;;   (lambda ()



reply via email to

[Prev in Thread] Current Thread [Next in Thread]