Mercurial > emacs
comparison lisp/progmodes/python.el @ 90813:e6fdae9180d4
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 698-710)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 216)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-196
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Tue, 24 Apr 2007 21:56:25 +0000 |
| parents | 4ef881a120fe 3ae6fc8b3d2c |
| children | d7172f202ab8 |
comparison
equal
deleted
inserted
replaced
| 90812:6137cc8ddf90 | 90813:e6fdae9180d4 |
|---|---|
| 979 (while (and (> arg 0) | 979 (while (and (> arg 0) |
| 980 (let* ((point (point)) | 980 (let* ((point (point)) |
| 981 (_ (if (python-comment-line-p) | 981 (_ (if (python-comment-line-p) |
| 982 (python-skip-comments/blanks t))) | 982 (python-skip-comments/blanks t))) |
| 983 (ci (current-indentation)) | 983 (ci (current-indentation)) |
| 984 (open (python-open-block-statement-p))) | 984 (open (python-open-block-statement-p)) |
| 985 opoint) | |
| 985 (if (and (zerop ci) (not open)) | 986 (if (and (zerop ci) (not open)) |
| 986 (not (goto-char point)) | 987 (not (goto-char point)) |
| 987 (catch 'done | 988 (catch 'done |
| 988 (while (zerop (python-next-statement)) | 989 (setq opoint (point)) |
| 990 (while (and (zerop (python-next-statement)) | |
| 991 (not (= opoint (point)))) | |
| 992 (setq opoint (point)) | |
| 989 (when (or (and open (<= (current-indentation) ci)) | 993 (when (or (and open (<= (current-indentation) ci)) |
| 990 (< (current-indentation) ci)) | 994 (< (current-indentation) ci)) |
| 991 (python-skip-comments/blanks t) | 995 (python-skip-comments/blanks t) |
| 992 (beginning-of-line 2) | 996 (beginning-of-line 2) |
| 993 (throw 'done t))))))) | 997 (throw 'done t))))))) |