Mercurial > emacs
comparison lisp/progmodes/python.el @ 80874:ca9519bf5703
Merge from emacs--rel--22
Patches applied:
* emacs--rel--22 (patch 11)
- Update from CVS
2007-05-08 David Reitter <david.reitter@gmail.com>
* lisp/progmodes/python.el (python-guess-indent): Check non-nullness
before comparing indent against the 2..8 interval.
2007-05-07 Stefan Monnier <monnier@iro.umontreal.ca>
* src/editfns.c (Ftranspose_regions): Yet another int/Lisp_Object mixup
(YAILOM)
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-736
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Tue, 08 May 2007 02:07:17 +0000 |
| parents | 3ae6fc8b3d2c 32334cd7302e |
| children | 4882ec1204fb |
comparison
equal
deleted
inserted
replaced
| 80873:c2c723c45f9a | 80874:ca9519bf5703 |
|---|---|
| 459 (save-excursion | 459 (save-excursion |
| 460 (python-beginning-of-statement) | 460 (python-beginning-of-statement) |
| 461 (let ((initial (current-indentation))) | 461 (let ((initial (current-indentation))) |
| 462 (if (zerop (python-next-statement)) | 462 (if (zerop (python-next-statement)) |
| 463 (setq indent (- (current-indentation) initial))) | 463 (setq indent (- (current-indentation) initial))) |
| 464 (if (and (>= indent 2) (<= indent 8)) ; sanity check | 464 (if (and indent (>= indent 2) (<= indent 8)) ; sanity check |
| 465 (setq done t)))))) | 465 (setq done t)))))) |
| 466 (when done | 466 (when done |
| 467 (when (/= indent (default-value 'python-indent)) | 467 (when (/= indent (default-value 'python-indent)) |
| 468 (set (make-local-variable 'python-indent) indent) | 468 (set (make-local-variable 'python-indent) indent) |
| 469 (unless (= tab-width python-indent) | 469 (unless (= tab-width python-indent) |