Mercurial > emacs
changeset 106743:2db50e698b85
* progmodes/python.el (python-font-lock-keywords): Handle qualified decorators
(Bug#881).
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Tue, 05 Jan 2010 15:11:04 -0700 |
| parents | debedd261607 |
| children | f973aced61a2 417baf3f58fe |
| files | lisp/ChangeLog lisp/progmodes/python.el |
| diffstat | 2 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Jan 05 13:19:34 2010 -0800 +++ b/lisp/ChangeLog Tue Jan 05 15:11:04 2010 -0700 @@ -1,3 +1,8 @@ +2010-01-05 Tom Tromey <tromey@redhat.com> + + * progmodes/python.el (python-font-lock-keywords): Handle + qualified decorators (Bug#881). + 2010-01-05 Dan Nicolaescu <dann@ics.uci.edu> * vc-bzr.el (vc-bzr-working-revision): Fix looking for a revision
--- a/lisp/progmodes/python.el Tue Jan 05 13:19:34 2010 -0800 +++ b/lisp/progmodes/python.el Tue Jan 05 15:11:04 2010 -0700 @@ -1,6 +1,6 @@ ;;; python.el --- silly walks for Python -*- coding: iso-8859-1 -*- -;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 +;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 ;; Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> @@ -112,7 +112,9 @@ ;; Top-level assignments are worth highlighting. (,(rx line-start (group (1+ (or word ?_))) (0+ space) "=") (1 font-lock-variable-name-face)) - (,(rx line-start (* (any " \t")) (group "@" (1+ (or word ?_)))) ; decorators + ;; Decorators. + (,(rx line-start (* (any " \t")) (group "@" (1+ (or word ?_)) + (0+ "." (1+ (or word ?_))))) (1 font-lock-type-face)) ;; Built-ins. (The next three blocks are from ;; `__builtin__.__dict__.keys()' in Python 2.5.1.) These patterns