mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-27 02:10:52 -08:00
Code Issues Projects Releases Wiki Activity

python-indent-guess-indent-offset improvements

Browse source
This commit is contained in:
Fabián Ezequiel Gallina 2012-05-17 00:02:54 -03:00 • committed by Fabián Ezequiel Gallina
parent 183f9296f1
commit bbac1eb8ab
1 changed files with 25 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

43
lisp/progmodes/python.el
View file

@ -402,24 +402,31 @@ These make `python-indent-calculate-indentation' subtract the value of
(defun python-indent-guess-indent-offset ()
"Guess and set `python-indent-offset' for the current buffer."
(save-excursion
(let ((found-block))
(while (and (not found-block)
(re-search-forward
(python-rx line-start block-start) nil t))
(when (not (syntax-ppss-context (syntax-ppss)))
(setq found-block t)))
(if (not found-block)
(message "Can't guess python-indent-offset, using defaults: %s"
python-indent-offset)
(while (and (progn
(goto-char (line-end-position))
(python-info-continuation-line-p))
(not (eobp)))
(forward-line 1))
(forward-line 1)
(forward-comment 1)
(setq python-indent-offset (current-indentation))))))
(save-excursion
(save-restriction
(widen)
(goto-char (point-min))
(let ((found-block))
(while (and (not found-block)
(re-search-forward
(python-rx line-start block-start) nil t))
(when (and (not (syntax-ppss-context (syntax-ppss)))
(progn
(goto-char (line-end-position))
(forward-comment -1)
(eq ?: (char-before))))
(setq found-block t)))
(if (not found-block)
(message "Can't guess python-indent-offset, using defaults: %s"
python-indent-offset)
(while (and (progn
(goto-char (line-end-position))
(python-info-continuation-line-p))
(not (eobp)))
(forward-line 1))
(forward-line 1)
(forward-comment 1)
(setq python-indent-offset (current-indentation)))))))
(defun python-indent-context (&optional stop)
"Return information on indentation context.