diff options
| author | Karoly Lorentey | 2004-07-04 21:51:32 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2004-07-04 21:51:32 +0000 |
| commit | d0cf63f7695c5d5886a3631ea3c03e82d52ca7c2 (patch) | |
| tree | 4d50eceb105a3868b8a040ba0666195a7fe71869 /lisp/progmodes/python.el | |
| parent | d7e4838fdf4ad2d3ec267bbcd84846abad6bb570 (diff) | |
| parent | 2a1a35c60c3acad58ed135fa52efcaceb0ff9091 (diff) | |
| download | emacs-d0cf63f7695c5d5886a3631ea3c03e82d52ca7c2.tar.gz emacs-d0cf63f7695c5d5886a3631ea3c03e82d52ca7c2.zip | |
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-437
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-438
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-209
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 274480a36de..9be2c7599b8 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -710,16 +710,17 @@ Accounts for continuation lines, multi-line strings, and multi-line bracketed | |||
| 710 | expressions." | 710 | expressions." |
| 711 | (beginning-of-line) | 711 | (beginning-of-line) |
| 712 | (python-beginning-of-string) | 712 | (python-beginning-of-string) |
| 713 | (while (python-continuation-line-p) | 713 | (catch 'foo |
| 714 | (beginning-of-line) | 714 | (while (python-continuation-line-p) |
| 715 | (if (python-backslash-continuation-line-p) | 715 | (beginning-of-line) |
| 716 | (while (python-backslash-continuation-line-p) | 716 | (if (python-backslash-continuation-line-p) |
| 717 | (forward-line -1)) | 717 | (while (python-backslash-continuation-line-p) |
| 718 | (python-beginning-of-string) | 718 | (forward-line -1)) |
| 719 | ;; Skip forward out of nested brackets. | 719 | (python-beginning-of-string) |
| 720 | (condition-case () ; beware invalid syntax | 720 | ;; Skip forward out of nested brackets. |
| 721 | (progn (backward-up-list (syntax-ppss-depth (syntax-ppss))) t) | 721 | (condition-case () ; beware invalid syntax |
| 722 | (error (end-of-line))))) | 722 | (progn (backward-up-list (syntax-ppss-depth (syntax-ppss))) t) |
| 723 | (error (throw 'foo nil)))))) | ||
| 723 | (back-to-indentation)) | 724 | (back-to-indentation)) |
| 724 | 725 | ||
| 725 | (defun python-end-of-statement () | 726 | (defun python-end-of-statement () |