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

the names.

Fixes: debbugs:16620

2 files changed, 10 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a97860c8aa6..a7109284991 100644
--- 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 4b118609d1e..ee058a8f607 100644
--- 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)))))