[Emacs-diffs] Changes to emacs/lisp/progmodes/python.el, v [EMACS_22_BASE]

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Stefan Monnier <monnier>        07/05/10 17:39:28

Index: progmodes/python.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/python.el,v
retrieving revision 1.58.2.3
retrieving revision 1.58.2.4
diff -u -b -r1.58.2.3 -r1.58.2.4
--- progmodes/python.el 8 May 2007 01:34:55 -0000       1.58.2.3
+++ progmodes/python.el 10 May 2007 17:39:26 -0000      1.58.2.4
@@ -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 @@
   (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)
@@ -2240,7 +2240,7 @@
        #'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)