diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-09-30 19:19:31 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-09-30 19:19:31 -0400 |
| commit | 07bec0fc67ee0b26685f0ec7f28d9b73f67bf3de (patch) | |
| tree | 222adf06960f86aa8b2f560217d39c9fe39d3996 /lisp/progmodes/python.el | |
| parent | 6aed001ad31d41f028d77e66e597b7b3ab4e31ae (diff) | |
| parent | d3b7a90bc2ad20192d1afd23eb1aa6a18ceda569 (diff) | |
| download | emacs-07bec0fc67ee0b26685f0ec7f28d9b73f67bf3de.tar.gz | |
Merge from emacs-24
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index e617e2932d0..6c11a478942 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -3300,7 +3300,8 @@ JUSTIFY should be used (if applicable) as in `fill-paragraph'." (end-of-line) (when (not (python-syntax-context 'paren)) (skip-syntax-backward "^)"))) - (while (python-syntax-context 'paren) + (while (and (python-syntax-context 'paren) + (not (eobp))) (goto-char (1+ (point-marker)))) (point-marker))) (let ((paragraph-start "\f\\|[ \t]*$") @@ -3311,7 +3312,8 @@ JUSTIFY should be used (if applicable) as in `fill-paragraph'." (while (not (eobp)) (forward-line 1) (python-indent-line) - (goto-char (line-end-position)))) t) + (goto-char (line-end-position)))) + t) ;;; Skeletons |