diff options
| author | Glenn Morris | 2011-05-16 19:26:56 -0700 |
|---|---|---|
| committer | Glenn Morris | 2011-05-16 19:26:56 -0700 |
| commit | c71a0d48f3c880248a7f7f25e92ddbcbad5ef0e7 (patch) | |
| tree | 95faf008ad25b86853394e20af6a5b129d5b2a97 /lisp/progmodes/python.el | |
| parent | e5946384189a9c0cc818687a497978182914f395 (diff) | |
| parent | 165fd2df8cc5cfc292d8f2b81c7ff259bf7b9561 (diff) | |
| download | emacs-c71a0d48f3c880248a7f7f25e92ddbcbad5ef0e7.tar.gz emacs-c71a0d48f3c880248a7f7f25e92ddbcbad5ef0e7.zip | |
Merge from emacs-23; up to 2010-06-11T14:39:54Z!cyd@stupidchicken.com.
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 @@ | |||
| 99 | "import" "in" "is" "lambda" "not" "or" "pass" "print" | 99 | "import" "in" "is" "lambda" "not" "or" "pass" "print" |
| 100 | "raise" "return" "try" "while" "with" "yield" | 100 | "raise" "return" "try" "while" "with" "yield" |
| 101 | ;; Not real keywords, but close enough to be fontified as such | 101 | ;; Not real keywords, but close enough to be fontified as such |
| 102 | "self" "True" "False") | 102 | "self" "True" "False" |
| 103 | ;; Python 3 | ||
| 104 | "nonlocal") | ||
| 103 | symbol-end) | 105 | symbol-end) |
| 104 | (,(rx symbol-start "None" symbol-end) ; see § Keywords in 2.7 manual | 106 | (,(rx symbol-start "None" symbol-end) ; see § Keywords in 2.7 manual |
| 105 | . font-lock-constant-face) | 107 | . font-lock-constant-face) |