diff options
| author | Kenichi Handa <handa@m17n.org> | 2010-09-01 16:13:21 +0900 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2010-09-01 16:13:21 +0900 |
| commit | 9e69cb054d5c124bdf913c82453518ac4d9d6d53 (patch) | |
| tree | 95537c8c17759cef4da7241d914059d15d7dc0c4 /lisp/progmodes/python.el | |
| parent | 0a46a12f7a484e3fab96ea2f46fa738e90dabf1c (diff) | |
| parent | d419e1d94e885388b86f8753d741befa1855d333 (diff) | |
| download | emacs-9e69cb054d5c124bdf913c82453518ac4d9d6d53.tar.gz emacs-9e69cb054d5c124bdf913c82453518ac4d9d6d53.tar.bz2 emacs-9e69cb054d5c124bdf913c82453518ac4d9d6d53.zip | |
merge changes in emacs-23 branch
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 2690d399411..2f65ffa1e17 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -782,7 +782,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.") |