aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2006-09-09 19:48:36 +0000
committerStefan Monnier2006-09-09 19:48:36 +0000
commit0b01facaa26b182854259fb7a08a255fe8cc364a (patch)
tree5b8854d52f1bd681cfea7461b5e100f95584eb1e
parentd8ca7d34751c7602f50e8ad4860a026f26f3f24a (diff)
downloademacs-0b01facaa26b182854259fb7a08a255fe8cc364a.tar.gz
emacs-0b01facaa26b182854259fb7a08a255fe8cc364a.zip
(python-font-lock-keywords): Add `self' and other quasi-keywords.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/python.el4
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 835914c12ef..83129833d2b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12006-09-09 Slawomir Nowaczyk <slawomir.nowaczyk.847@student.lu.se> (tiny change)
2
3 * progmodes/python.el (python-font-lock-keywords): Add `self' and other
4 quasi-keywords.
5
12006-09-09 Stefan Monnier <monnier@iro.umontreal.ca> 62006-09-09 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * progmodes/python.el: Quieten the compiler about hippie-expand vars. 8 * progmodes/python.el: Quieten the compiler about hippie-expand vars.
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 1299ff368d9..712d75afff9 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -96,7 +96,9 @@
96 "import" "in" "is" "lambda" "not" "or" "pass" "print" 96 "import" "in" "is" "lambda" "not" "or" "pass" "print"
97 "raise" "return" "try" "while" "yield" 97 "raise" "return" "try" "while" "yield"
98 ;; Future keywords 98 ;; Future keywords
99 "as" "None") 99 "as" "None"
100 ;; Not real keywords, but close enough to be fontified as such
101 "self" "True" "False")
100 symbol-end) 102 symbol-end)
101 ;; Definitions 103 ;; Definitions
102 (,(rx symbol-start (group "class") (1+ space) (group (1+ (or word ?_)))) 104 (,(rx symbol-start (group "class") (1+ space) (group (1+ (or word ?_))))