From: Chris Foote <chris@foote.com.au>
Date: Mon, 23 Aug 2010 00:44:55 +0000 (-0400)
Subject: * progmodes/python.el (python-block-pairs): Allow use of "finally" with "else" (Bug... 
X-Git-Tag: emacs-pretest-23.2.90~139^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9027027d085973006891374fdc337334a5db7b5b;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8ea9d0b975e..da88208bbf2 100644
--- 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 2b09e346331..ed2a3236be1 100644
--- 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.")