diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-05-17 17:39:40 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-05-17 17:39:40 -0700 |
| commit | 7025ee00190a709853bf5b809bf86148efda3bc7 (patch) | |
| tree | e1b861b3ea59872e652462289bb7f215d5cfbfbe /lisp/progmodes/python.el | |
| parent | d2d818bf00fa3a3204abd9b31103cfca21ff8125 (diff) | |
| parent | 3870d303a44e14c460977c50473e5069742cd0b6 (diff) | |
| download | emacs-7025ee00190a709853bf5b809bf86148efda3bc7.tar.gz emacs-7025ee00190a709853bf5b809bf86148efda3bc7.tar.bz2 emacs-7025ee00190a709853bf5b809bf86148efda3bc7.zip | |
Merge from mainline.
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index a7851c54356..67a51dfbeee 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -99,7 +99,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) |