diff options
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 641563ae0ab..ccb2dcba42e 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -157,7 +157,7 @@ | |||
| 157 | 157 | ||
| 158 | ;; Skeletons: 6 skeletons are provided for simple inserting of class, | 158 | ;; Skeletons: 6 skeletons are provided for simple inserting of class, |
| 159 | ;; def, for, if, try and while. These skeletons are integrated with | 159 | ;; def, for, if, try and while. These skeletons are integrated with |
| 160 | ;; dabbrev. If you have `dabbrev-mode' activated and | 160 | ;; abbrev. If you have `abbrev-mode' activated and |
| 161 | ;; `python-skeleton-autoinsert' is set to t, then whenever you type | 161 | ;; `python-skeleton-autoinsert' is set to t, then whenever you type |
| 162 | ;; the name of any of those defined and hit SPC, they will be | 162 | ;; the name of any of those defined and hit SPC, they will be |
| 163 | ;; automatically expanded. As an alternative you can use the defined | 163 | ;; automatically expanded. As an alternative you can use the defined |
| @@ -642,7 +642,8 @@ It makes underscores and dots word constituent chars.") | |||
| 642 | These make `python-indent-calculate-indentation' subtract the value of | 642 | These make `python-indent-calculate-indentation' subtract the value of |
| 643 | `python-indent-offset'.") | 643 | `python-indent-offset'.") |
| 644 | 644 | ||
| 645 | (defvar python-indent-block-enders '("return" "pass") | 645 | (defvar python-indent-block-enders |
| 646 | '("break" "continue" "pass" "raise" "return") | ||
| 646 | "List of words that mark the end of a block. | 647 | "List of words that mark the end of a block. |
| 647 | These make `python-indent-calculate-indentation' subtract the | 648 | These make `python-indent-calculate-indentation' subtract the |
| 648 | value of `python-indent-offset' when `python-indent-context' is | 649 | value of `python-indent-offset' when `python-indent-context' is |