(python-font-lock-keywords, python-open-block-statement-p, python-mode):

Add support for the new "with" keyword.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f89d2562d99d758830ab8f207543919f40c855dd..9f519f688e154b9ec5beedf6fdeea8198f5fe9d4 100644 (file)
--- 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 f45b144779ccd841f992e5931c2a468944eb4be2..d2e913f23152f93fc708c2631104c73ee32a6914 100644 (file)
--- 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)