diff options
| author | Chris Foote <chris@foote.com.au> | 2010-08-22 20:44:55 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-08-22 20:44:55 -0400 |
| commit | 9027027d085973006891374fdc337334a5db7b5b (patch) | |
| tree | 7ef366c4317116904c726ab9cb73fdb3bb08077b /lisp | |
| parent | d8f0aff6cd7301e1399563dff793881f70fd7dbd (diff) | |
| download | emacs-9027027d085973006891374fdc337334a5db7b5b.tar.gz | |
* progmodes/python.el (python-block-pairs): Allow use of "finally" with "else" (Bug#3991).
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/python.el | 2 |
2 files changed, 6 insertions, 1 deletions
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.") |