* lisp/emacs-lisp/ert.el (ert--activate-font-lock-keywords): Allow dashes in

the names.

Fixes: debbugs:16620

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a97860c8aa613af4c5f4e3cacbb935931c1d93ff..a7109284991a392fe7a839c3fa036395d54d1a46 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,12 @@
+2014-02-04  Anders Lindgren  <andlind@gmail.com>
+
+       * emacs-lisp/ert.el (ert--activate-font-lock-keywords): Allow dashes in
+       the names (bug#16620).
+
 2014-02-03  Martin Rudalics  <rudalics@gmx.at>
 
-       * faces.el (window-divider): New default value.  Rewrite
-       doc-string.
-       (window-divider-first-pixel, window-divider-last-pixel): New
-       faces.
+       * faces.el (window-divider): New default value.  Rewrite doc-string.
+       (window-divider-first-pixel, window-divider-last-pixel): New faces.
 
 2014-02-03  Dmitry Gutov  <dgutov@yandex.ru>
 
@@ -34,8 +37,8 @@
 
 2014-02-02  Daniel Colascione  <dancol@dancol.org>
 
-       * help-at-pt.el (help-at-pt-string,help-at-pt-maybe-display): Also
-       try to display local help from just before point.
+       * help-at-pt.el (help-at-pt-string,help-at-pt-maybe-display):
+       Also try to display local help from just before point.
 
 2014-02-02  Alan Mackenzie  <bug-cc-mode@gnu.org>
 

diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el
index 4b118609d1eff556a10c915df2fab85da0296c89..ee058a8f607d2e2b782e7b2a7e87c9e0b5b7ec51 100644 (file)
--- a/lisp/emacs-lisp/ert.el
+++ b/lisp/emacs-lisp/ert.el
@@ -1469,7 +1469,7 @@ the tests)."
   "Activate font-lock keywords for some of ERT's symbols."
   (font-lock-add-keywords
    nil
-   '(("(\\(\\<ert-deftest\\)\\>\\s *\\(\\sw+\\)?"
+   '(("(\\(\\<ert-deftest\\)\\>\\s *\\(\\(?:\\sw\\|\\s_\\)+\\)?"
       (1 font-lock-keyword-face nil t)
       (2 font-lock-function-name-face nil t)))))