procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* progmodes/python.el (python-nav-end-of-statement): Fix

Browse source 
cornercase when handling multiline strings.
This commit is contained in:
Fabián Ezequiel Gallina 2013-01-10 00:44:12 -03:00
parent c4dd9efc9e
commit 5062005180
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2013-01-10 Fabián Ezequiel Gallina <fgallina@cuca>
* progmodes/python.el (python-nav-end-of-statement): Fix
cornercase when handling multiline strings.
2013-01-10 Glenn Morris <rgm@gnu.org>
* emacs-lisp/authors.el (authors-ignored-files)

13
lisp/progmodes/python.el
View file

@ -1188,7 +1188,16 @@ of the statement."
(not (eobp))
(cond ((setq string-start (python-syntax-context 'string))
(goto-char string-start)
(python-nav-end-of-statement t))
(if (python-syntax-context 'paren)
;; Ended up inside a paren, roll again.
(python-nav-end-of-statement t)
;; This is not inside a paren, move to the
;; end of this string.
(goto-char (+ (point)
(python-syntax-count-quotes
(char-after (point)) (point))))
(or (re-search-forward (rx (syntax string-delimiter)) nil t)
(goto-char (point-max)))))
((python-syntax-context 'paren)
;; The statement won't end before we've escaped
;; at least one level of parenthesis.
@ -1302,7 +1311,7 @@ backward to previous block."
"Safe version of standard `forward-sexp'.
When ARG > 0 move forward, else if ARG is < 0."
(or arg (setq arg 1))
(let ((forward-sexp-function nil)
(let ((forward-sexp-function)
(paren-regexp
(if (> arg 0) (python-rx close-paren) (python-rx open-paren)))
(search-fn