aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/python.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8ea9d0b975..da88208bbf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-23 Chris Foote <[email protected]> (tiny change)
+
+ * progmodes/python.el (python-block-pairs): Allow use of "finally"
+ with "else" (Bug#3991).
+
2010-08-22 Leo <[email protected]>
* 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 2b09e34633..ed2a3236be 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.")