summaryrefslogtreecommitdiff
path: root/lisp/progmodes
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2010-01-05 15:11:04 -0700
committerChong Yidong <cyd@stupidchicken.com>2010-01-05 15:11:04 -0700
commitfd579fdca5cb3a71cdb24bace02c335d838a6922 (patch)
treeffdf43b4c73b37126a0d47b30ae78cf9a3b0fb10 /lisp/progmodes
parent37860cafd5acdc2348675f2e9bc1a0934a55f30d (diff)
downloademacs-fd579fdca5cb3a71cdb24bace02c335d838a6922.tar.gz
* progmodes/python.el (python-font-lock-keywords): Handle qualified decorators
(Bug#881).
Diffstat (limited to 'lisp/progmodes')
-rw-r--r--lisp/progmodes/python.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 104ea26689f..94124ad54f0 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 <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