Mercurial > emacs
changeset 77663:32334cd7302e
(python-guess-indent): Check non-nullness before comparing indent against
the 2..8 interval.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Tue, 08 May 2007 01:35:26 +0000 |
| parents | 5d52aaf30988 |
| children | f79d4df148cb ca9519bf5703 |
| files | lisp/ChangeLog lisp/progmodes/python.el |
| diffstat | 2 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon May 07 23:42:38 2007 +0000 +++ b/lisp/ChangeLog Tue May 08 01:35:26 2007 +0000 @@ -1,3 +1,8 @@ +2007-05-08 David Reitter <david.reitter@gmail.com> + + * progmodes/python.el (python-guess-indent): Check non-nullness + before comparing indent against the 2..8 interval. + 2007-05-07 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> * term/mac-win.el (mac-ts-unicode-for-key-event): Check if text is @@ -27,9 +32,9 @@ 2007-04-29 Davis Herring <herring@lanl.gov> - * calendar/timeclock.el (timeclock-in): Fix non-interactive + * calendar/timeclock.el (timeclock-in): Fix non-interactive workday specifications. - (timeclock-log): Don't kill the log buffer if it already existed. + (timeclock-log): Don't kill the log buffer if it already existed. 2007-04-29 Richard Stallman <rms@gnu.org>
--- a/lisp/progmodes/python.el Mon May 07 23:42:38 2007 +0000 +++ b/lisp/progmodes/python.el Tue May 08 01:35:26 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))