diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2007-05-09 16:56:20 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2007-05-09 16:56:20 +0000 |
| commit | 0b480dc77303bd9de41ee7b90a9b2e133712a25c (patch) | |
| tree | 52f74a24b824a8f662c3d3d7c7d8b4adfe36d082 /lisp | |
| parent | 0f21ecf3c59d4ad711f27384d144c7da834ff20a (diff) | |
| download | emacs-0b480dc77303bd9de41ee7b90a9b2e133712a25c.tar.gz | |
(python-font-lock-keywords, python-open-block-statement-p, python-mode):
Add support for the new "with" keyword.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/progmodes/python.el | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f89d2562d99..9f519f688e1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2007-05-09 Edward O'Connor <hober0@gmail.com> (tiny change) + + * progmodes/python.el (python-font-lock-keywords) + (python-open-block-statement-p, python-mode): Add support for the new + "with" keyword. + 2007-05-08 Stefan Monnier <monnier@iro.umontreal.ca> * diff-mode.el (diff-apply-hunk, diff-test-hunk): Don't do by default diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index f45b144779c..d2e913f2315 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -96,7 +96,7 @@ "import" "in" "is" "lambda" "not" "or" "pass" "print" "raise" "return" "try" "while" "yield" ;; Future keywords - "as" "None" + "as" "None" "with" ;; Not real keywords, but close enough to be fontified as such "self" "True" "False") symbol-end) @@ -374,7 +374,7 @@ BOS non-nil means point is known to be at beginning of statement." (save-excursion (unless bos (python-beginning-of-statement)) (looking-at (rx (and (or "if" "else" "elif" "while" "for" "def" - "class" "try" "except" "finally") + "class" "try" "except" "finally" "with") symbol-end))))) (defun python-close-block-statement-p (&optional bos) @@ -2239,7 +2239,7 @@ with skeleton expansions for compound statement templates. #'python-current-defun) (set (make-local-variable 'outline-regexp) (rx (* space) (or "class" "def" "elif" "else" "except" "finally" - "for" "if" "try" "while") + "for" "if" "try" "while" "with") symbol-end)) (set (make-local-variable 'outline-heading-end-regexp) ":\\s-*\n") (set (make-local-variable 'outline-level) #'python-outline-level) |