* progmodes/python.el (python-font-lock-keywords): Handle qualified decorators

(Bug#881).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2dc2a1270bda4cf056dad03385582cd29b1aa580..2827ff8d9d51f90004b9cd85c256a4c6b9597039 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 104ea26689f6f494454923ad3758ac56afe5abfc..94124ad54f0d409a5cc8d05b46f4c2f89c098681 100644 (file)
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -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