[Emacs-diffs] trunk r116262: * lisp/emacs-lisp/ert.el (ert--activate-font-lock-keywords): Allow dashes in

[Stefan Monnier]

------------------------------------------------------------
revno: 116262
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16620
author: Anders Lindgren <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2014-02-04 12:37:08 -0500
message:
  * lisp/emacs-lisp/ert.el (ert--activate-font-lock-keywords): Allow dashes in
  the names.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/ert.el         ert.el-20110112160650-056hnl9qhpjvjicy-2

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-02-04 07:36:58 +0000
+++ b/lisp/ChangeLog    2014-02-04 17:37:08 +0000
@@ -1,9 +1,12 @@
+2014-02-04  Anders Lindgren  <address@hidden>
+
+       * emacs-lisp/ert.el (ert--activate-font-lock-keywords): Allow dashes in
+       the names (bug#16620).
+
 2014-02-03  Martin Rudalics  <address@hidden>
 
-       * 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  <address@hidden>
 
@@ -34,8 +37,8 @@
 
 2014-02-02  Daniel Colascione  <address@hidden>
 
-       * 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  <address@hidden>
 

=== modified file 'lisp/emacs-lisp/ert.el'
--- a/lisp/emacs-lisp/ert.el    2014-01-01 07:43:34 +0000
+++ b/lisp/emacs-lisp/ert.el    2014-02-04 17:37:08 +0000
@@ -1469,7 +1469,7 @@
   "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)))))