diff options
| author | Juanma Barranquero | 2011-05-13 14:44:48 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2011-05-13 14:44:48 +0200 |
| commit | ce1539b46ddb8b45aadf70888f6e42e39d944865 (patch) | |
| tree | 173384170e5df04548cc40d4b549f4326e40c8bf | |
| parent | e531bdfff1ee57a0ba4af6c8575ed7856e4c86d2 (diff) | |
| download | emacs-ce1539b46ddb8b45aadf70888f6e42e39d944865.tar.gz emacs-ce1539b46ddb8b45aadf70888f6e42e39d944865.zip | |
lisp/progmodes/python.el: Highlight keyword "nonlocal" (bug#8639).
| -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 @@ | |||
| 1 | 2011-05-13 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * progmodes/python.el (python-font-lock-keywords): | ||
| 4 | Add the Python 3.X keyword "nonlocal" (bug#8639). | ||
| 5 | |||
| 1 | 2011-05-09 Eli Zaretskii <eliz@gnu.org> | 6 | 2011-05-09 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * smerge-mode.el (smerge-resolve): Use null-device rather than a | 8 | * 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 @@ | |||
| 100 | "import" "in" "is" "lambda" "not" "or" "pass" "print" | 100 | "import" "in" "is" "lambda" "not" "or" "pass" "print" |
| 101 | "raise" "return" "try" "while" "with" "yield" | 101 | "raise" "return" "try" "while" "with" "yield" |
| 102 | ;; Not real keywords, but close enough to be fontified as such | 102 | ;; Not real keywords, but close enough to be fontified as such |
| 103 | "self" "True" "False") | 103 | "self" "True" "False" |
| 104 | ;; Python 3 | ||
| 105 | "nonlocal") | ||
| 104 | symbol-end) | 106 | symbol-end) |
| 105 | (,(rx symbol-start "None" symbol-end) ; see § Keywords in 2.7 manual | 107 | (,(rx symbol-start "None" symbol-end) ; see § Keywords in 2.7 manual |
| 106 | . font-lock-constant-face) | 108 | . font-lock-constant-face) |