Mercurial > emacs
diff 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 |
line wrap: on
line diff
--- a/lisp/progmodes/python.el Tue May 08 00:50:07 2007 +0000 +++ b/lisp/progmodes/python.el Tue May 08 02:07:17 2007 +0000 @@ -461,7 +461,7 @@ (let ((initial (current-indentation))) (if (zerop (python-next-statement)) (setq indent (- (current-indentation) initial))) - (if (and (>= indent 2) (<= indent 8)) ; sanity check + (if (and indent (>= indent 2) (<= indent 8)) ; sanity check (setq done t)))))) (when done (when (/= indent (default-value 'python-indent))