Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

(py-parse-state): stop searching backwards when we found a keyword at 

column zero.  Perhaps a kludge, but similar in nature to Emacs'
beginning-of-defun shortcut.
This commit is contained in:
Barry Warsaw 1996-07-31 20:57:22 +00:00
parent f831d81999
commit 170ffa775d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Misc/python-mode.el
View File

@ -1792,7 +1792,7 @@ local bindings to py-newline-and-indent."))
(defun py-parse-state () (defun py-parse-state ()
(save-excursion (save-excursion
(let ((here (point)) (let ((here (point))
pps done) pps done ci)
(while (not done) (while (not done)
;; back up to the first preceding line (if any; else start of ;; back up to the first preceding line (if any; else start of
;; buffer) that begins with a popular Python keyword, or a ;; buffer) that begins with a popular Python keyword, or a
@ -1801,11 +1801,15 @@ local bindings to py-newline-and-indent."))
;; at a non-zero nesting level. It may be slow for people who ;; at a non-zero nesting level. It may be slow for people who
;; write huge code blocks or huge lists ... tough beans. ;; write huge code blocks or huge lists ... tough beans.
(re-search-backward py-parse-state-re nil 'move) (re-search-backward py-parse-state-re nil 'move)
(setq ci (current-indentation))
(beginning-of-line) (beginning-of-line)
(save-excursion (save-excursion
(setq pps (parse-partial-sexp (point) here))) (setq pps (parse-partial-sexp (point) here)))
;; make sure we don't land inside a triple-quoted string ;; make sure we don't land inside a triple-quoted string
(setq done (or (not (nth 3 pps)) (bobp)))) (setq done (or (zerop ci)
(not (nth 3 pps))
(bobp)))
)
pps))) pps)))
;; if point is at a non-zero nesting level, returns the number of the ;; if point is at a non-zero nesting level, returns the number of the