diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/progmodes/python.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index eea22d639d7..98e231fde97 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2008-05-05 Phil Sung <psung@mit.edu> (tiny change) | ||
| 2 | |||
| 3 | * progmodes/python.el (python-block-pairs): Align finally with except. | ||
| 4 | |||
| 1 | 2008-05-05 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2008-05-05 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * vc-rcs.el (vc-rcs-fetch-master-state): Fix inf-loop. | 7 | * vc-rcs.el (vc-rcs-fetch-master-state): Fix inf-loop. |
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 36bc1178288..259b095bc7d 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -747,7 +747,7 @@ Set `python-indent' locally to the value guessed." | |||
| 747 | '(("else" "if" "elif" "while" "for" "try" "except") | 747 | '(("else" "if" "elif" "while" "for" "try" "except") |
| 748 | ("elif" "if" "elif") | 748 | ("elif" "if" "elif") |
| 749 | ("except" "try" "except") | 749 | ("except" "try" "except") |
| 750 | ("finally" "try")) | 750 | ("finally" "try" "except")) |
| 751 | "Alist of keyword matches. | 751 | "Alist of keyword matches. |
| 752 | The car of an element is a keyword introducing a statement which | 752 | The car of an element is a keyword introducing a statement which |
| 753 | can close a block opened by a keyword in the cdr.") | 753 | can close a block opened by a keyword in the cdr.") |