# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1282524295 14400
# Node ID fae81355c62c7ff81287479ac0ef0746e8172c9e
# Parent  1489c9287d5304e0ec434cd3bd4c53d85c520c55
* progmodes/python.el (python-block-pairs): Allow use of "finally" with "else" (Bug#3991).

diff -r 1489c9287d53 -r fae81355c62c lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Aug 22 19:50:38 2010 -0400
+++ b/lisp/ChangeLog	Sun Aug 22 20:44:55 2010 -0400
@@ -1,3 +1,8 @@
+2010-08-23  Chris Foote <chris@foote.com.au>  (tiny change)
+
+	* progmodes/python.el (python-block-pairs): Allow use of "finally"
+	with "else" (Bug#3991).
+
 2010-08-22  Leo  <sdl.web@gmail.com>
 
 	* net/rcirc.el (rcirc-add-or-remove): Accept a list of elements.
diff -r 1489c9287d53 -r fae81355c62c lisp/progmodes/python.el
--- a/lisp/progmodes/python.el	Sun Aug 22 19:50:38 2010 -0400
+++ b/lisp/progmodes/python.el	Sun Aug 22 20:44:55 2010 -0400
@@ -755,7 +755,7 @@
   '(("else" "if" "elif" "while" "for" "try" "except")
     ("elif" "if" "elif")
     ("except" "try" "except")
-    ("finally" "try" "except"))
+    ("finally" "else" "try" "except"))
   "Alist of keyword matches.
 The car of an element is a keyword introducing a statement which
 can close a block opened by a keyword in the cdr.")