diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2011-05-13 14:44:48 +0200 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2011-05-13 14:44:48 +0200 |
| commit | ce1539b46ddb8b45aadf70888f6e42e39d944865 (patch) | |
| tree | 173384170e5df04548cc40d4b549f4326e40c8bf /lisp | |
| parent | e531bdfff1ee57a0ba4af6c8575ed7856e4c86d2 (diff) | |
| download | emacs-ce1539b46ddb8b45aadf70888f6e42e39d944865.tar.gz | |
lisp/progmodes/python.el: Highlight keyword "nonlocal" (bug#8639).
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/python.el | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index aef0246571f..b1c7fd1f082 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-05-13 Juanma Barranquero <lekktu@gmail.com> + + * progmodes/python.el (python-font-lock-keywords): + Add the Python 3.X keyword "nonlocal" (bug#8639). + 2011-05-09 Eli Zaretskii <eliz@gnu.org> * smerge-mode.el (smerge-resolve): Use null-device rather than a diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index d21137b3080..86f82432578 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -100,7 +100,9 @@ "import" "in" "is" "lambda" "not" "or" "pass" "print" "raise" "return" "try" "while" "with" "yield" ;; Not real keywords, but close enough to be fontified as such - "self" "True" "False") + "self" "True" "False" + ;; Python 3 + "nonlocal") symbol-end) (,(rx symbol-start "None" symbol-end) ; see § Keywords in 2.7 manual . font-lock-constant-face) |