diff options
| author | Kenichi Handa | 2010-09-02 11:00:18 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2010-09-02 11:00:18 +0900 |
| commit | 56524ce00eaf104b1f59288ef219c8edb4ef311d (patch) | |
| tree | ac35fd89c65a2d2cf1e3ae8b9792e49dbd047b29 /lisp/progmodes/python.el | |
| parent | ae682ff5aeacc6e99a76d567b487cd2fa0d9a4a9 (diff) | |
| parent | 2333c84afd9263abd5c71b4503435c5db1292f94 (diff) | |
| download | emacs-56524ce00eaf104b1f59288ef219c8edb4ef311d.tar.gz emacs-56524ce00eaf104b1f59288ef219c8edb4ef311d.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." | |||
| 782 | '(("else" "if" "elif" "while" "for" "try" "except") | 782 | '(("else" "if" "elif" "while" "for" "try" "except") |
| 783 | ("elif" "if" "elif") | 783 | ("elif" "if" "elif") |
| 784 | ("except" "try" "except") | 784 | ("except" "try" "except") |
| 785 | ("finally" "try" "except")) | 785 | ("finally" "else" "try" "except")) |
| 786 | "Alist of keyword matches. | 786 | "Alist of keyword matches. |
| 787 | The car of an element is a keyword introducing a statement which | 787 | The car of an element is a keyword introducing a statement which |
| 788 | can close a block opened by a keyword in the cdr.") | 788 | can close a block opened by a keyword in the cdr.") |