[Fix #274] Correct font-locking of punctuation character literals

clojure-emacs · Mar 5, 2015 · fc856ba · fc856ba
1 parent 4b6d876
commit fc856ba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/clojure-mode.el b/clojure-mode.el
@@ -441,8 +441,7 @@ Called by `imenu--generic-function'."
          "\\>")
        0 font-lock-constant-face)
       ;; Character literals - \1, \a, \newline, \u0000
-      ;; FIXME: handle properly some punctuation characters (like commas and semicolumns)
-      ("\\\\\\([[:punct:]]\\|[a-z0-9]+\\)\\>" 0 'clojure-character-face)
+      ("\\\\\\([[:punct:]]\\|[a-z0-9]+\\>\\)" 0 'clojure-character-face)
       ;; Constant values (keywords), including as metadata e.g. ^:static
       ("\\<^?\\(:\\(\\sw\\|\\s_\\)+\\(\\>\\|\\_>\\)\\)" 1 'clojure-keyword-face)
       ;; cljx annotations (#+clj and #+cljs)

diff --git a/test/clojure-mode-test.el b/test/clojure-mode-test.el
@@ -205,7 +205,9 @@ POS."
   (should (eq (clojure-test-face-at 1 2 "\\1") 'clojure-character-face))
   (should (eq (clojure-test-face-at 1 6 "\\u0032") 'clojure-character-face))
   (should (eq (clojure-test-face-at 1 2 "\\+") 'clojure-character-face))
-  (should (eq (clojure-test-face-at 1 2 "\\.") 'clojure-character-face)))
+  (should (eq (clojure-test-face-at 1 2 "\\.") 'clojure-character-face))
+  (should (eq (clojure-test-face-at 1 2 "\\,") 'clojure-character-face))
+  (should (eq (clojure-test-face-at 1 2 "\\;") 'clojure-character-face)))
 
 (ert-deftest clojure-mode-syntax-table/cljx ()
   :tags '(fontification syntax-table)