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

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

[elpa] master bd9c147 20/47: Ignore the dot.


From: Jackson Ray Hamilton
Subject: [elpa] master bd9c147 20/47: Ignore the dot.
Date: Mon, 18 May 2015 09:51:50 +0000

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

    Ignore the dot.
---
 context-coloring.el           |    6 +++---
 test/context-coloring-test.el |    4 ++--
 test/fixtures/ignored.el      |    2 ++
 test/fixtures/unbindable.el   |    2 --
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/context-coloring.el b/context-coloring.el
index 4a37389..6f161c6 100644
--- a/context-coloring.el
+++ b/context-coloring.el
@@ -407,8 +407,8 @@ generated by `js2-mode'."
 (defconst context-coloring-arglist-arg-regexp
   "\\`[^&:]")
 
-(defconst context-coloring-unbindable-constant-regexp
-  "\\`[-+]?[0-9]\\|\\`t\\'\\|\\`nil\\'")
+(defconst context-coloring-ignored-word-regexp
+  "\\`[-+]?[0-9]\\|\\`t\\'\\|\\`nil\\'\\|\\`\\.\\'")
 
 (defconst context-coloring-COMMA-CHAR 44)
 (defconst context-coloring-BACKTICK-CHAR 96)
@@ -630,7 +630,7 @@ generated by `js2-mode'."
             (cond
              ;; Ignore constants such as numbers, keywords, t, nil.  These 
can't
              ;; be rebound, so they should be treated like syntax.
-             ((string-match-p context-coloring-unbindable-constant-regexp 
variable-string))
+             ((string-match-p context-coloring-ignored-word-regexp 
variable-string))
              ((keywordp (read variable-string)))
              (t
               (setq variable (intern variable-string))
diff --git a/test/context-coloring-test.el b/test/context-coloring-test.el
index 234084c..9573119 100644
--- a/test/context-coloring-test.el
+++ b/test/context-coloring-test.el
@@ -1130,11 +1130,11 @@ see that function."
   :setup (lambda ()
            (setq context-coloring-syntactic-strings t)))
 
-(context-coloring-test-deftest-emacs-lisp-mode unbindable
+(context-coloring-test-deftest-emacs-lisp-mode ignored
   (lambda ()
     (context-coloring-test-assert-coloring "
 (xxxxx x ()
-  (x x 1 11 11 111 11 1 111))")))
+  (x x 1 11 11 111 11 1 111 (1 1 1)))")))
 
 (context-coloring-test-deftest-emacs-lisp-mode let
   (lambda ()
diff --git a/test/fixtures/ignored.el b/test/fixtures/ignored.el
new file mode 100644
index 0000000..776a846
--- /dev/null
+++ b/test/fixtures/ignored.el
@@ -0,0 +1,2 @@
+(defun a ()
+  (+ a 1 +1 -1 1.0 :a t nil (0 . 0)))
diff --git a/test/fixtures/unbindable.el b/test/fixtures/unbindable.el
deleted file mode 100644
index d5bb47f..0000000
--- a/test/fixtures/unbindable.el
+++ /dev/null
@@ -1,2 +0,0 @@
-(defun a ()
-  (+ a 1 +1 -1 1.0 :a t nil))



reply via email to

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