From fd579fdca5cb3a71cdb24bace02c335d838a6922 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Tue, 5 Jan 2010 15:11:04 -0700 Subject: [PATCH] * progmodes/python.el (python-font-lock-keywords): Handle qualified decorators (Bug#881). --- lisp/ChangeLog | 5 +++++ lisp/progmodes/python.el | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2dc2a1270b..2827ff8d9d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-01-05 Tom Tromey + + * progmodes/python.el (python-font-lock-keywords): Handle + qualified decorators (Bug#881). + 2010-01-05 Dan Nicolaescu * 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 104ea26689..94124ad54f 100644 --- 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 @@ -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 -- 2.20.1