Cleanup.

diff --git a/context-coloring.el b/context-coloring.el
index ca15c4b7b03e95a9ecd6fa68d6ea8b3f84181697..e09b863578abc21f290562b415f26f62ebbe0554 100644 (file)
--- a/context-coloring.el
+++ b/context-coloring.el
@@ -484,9 +484,7 @@ elisp tracks, and asynchronously for shell command tracks."
 
 Invoke CALLBACK when complete; see `context-coloring-dispatch'."
   (interactive)
-  (context-coloring-dispatch
-   (lambda ()
-     (when callback (funcall callback)))))
+  (context-coloring-dispatch callback))
 
 (defvar-local context-coloring-changed nil
   "Indication that the buffer has changed recently, which implies
@@ -515,7 +513,8 @@ used.")
 produces (1 0 0), \"19700101\" produces (19700101), etc."
   (let (version)
     (while (string-match "[0-9]+" string)
-      (setq version (append version (list (string-to-number (match-string 0 string)))))
+      (setq version (append version
+                            (list (string-to-number (match-string 0 string)))))
       (setq string (substring string (match-end 0))))
     version))
 
@@ -988,7 +987,7 @@ Supported modes: `js-mode', `js3-mode'"
               (when colorize-initially-p
                 (context-coloring-colorize))))
         (when (null dispatch)
-          (message "%s" "Context coloring is not available for this major mode"))))))
+          (message "Context coloring is not available for this major mode"))))))
 
 (provide 'context-coloring)
 

diff --git a/test/context-coloring-test.el b/test/context-coloring-test.el
index deada982c0175de0e10407f40de7f28af70ccba3..cbd2002465fdc357e4ebf0f324c9fd132d62845d 100644 (file)
--- a/test/context-coloring-test.el
+++ b/test/context-coloring-test.el
@@ -137,7 +137,8 @@ in the typical format."
         (function-name (intern-soft
                         (format "context-coloring-test-js-%s" name)))
         (setup-function-name (intern-soft
-                              (format "context-coloring-test-js-%s-setup" name))))
+                              (format
+                               "context-coloring-test-js-%s-setup" name))))
     `(ert-deftest-async ,test-name (done)
                         (context-coloring-test-js-mode
                          ,fixture
@@ -157,7 +158,8 @@ format."
         (function-name (intern-soft
                         (format "context-coloring-test-js-%s" name)))
         (setup-function-name (intern-soft
-                              (format "context-coloring-test-js-%s-setup" name))))
+                              (format
+                               "context-coloring-test-js-%s-setup" name))))
     `(ert-deftest ,test-name ()
        (context-coloring-test-js2-mode
         ,fixture
@@ -288,7 +290,8 @@ is FOREGROUND, or the inverse if NEGATE is non-nil."
                                 "but it %s.")
                         level
                         (if negate "not " "") foreground
-                        (if negate "did" (format "was `%s'" actual-foreground)))))))
+                        (if negate
+                            "did" (format "was `%s'" actual-foreground)))))))
 
 (defun context-coloring-test-assert-not-face (&rest arguments)
   "Assert that LEVEL does not have a face with `:foreground'