* progmodes/python.el (python-block-pairs): Allow use of "finally" with "else" (Bug...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8ea9d0b975e6247903670de9b4d461a44c090fb9..da88208bbf29b7ee03c2b5f20767809ced6a4a44 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 2b09e34633193d26ffc21cd4a1af65ca451c4119..ed2a3236be10280143963f513d4f2f60ebeb2916 100644 (file)
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -755,7 +755,7 @@ Set `python-indent' locally to the value guessed."
   '(("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.")