diff options
| author | Stefan Monnier <[email protected]> | 2007-05-08 01:35:26 +0000 |
|---|---|---|
| committer | Stefan Monnier <[email protected]> | 2007-05-08 01:35:26 +0000 |
| commit | 11c4b29d3a3c1f3491e0822eb50fc3c285a047d2 (patch) | |
| tree | 847dcead3485c7b0c37a9ea92ee80c0dd5e6a745 | |
| parent | ce55f97ce30848064903b0e6ceab1f7f43c690a1 (diff) | |
(python-guess-indent): Check non-nullness before comparing indent against
the 2..8 interval.
| -rw-r--r-- | lisp/ChangeLog | 9 | ||||
| -rw-r--r-- | lisp/progmodes/python.el | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 957e975ded..be19004e95 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-05-08 David Reitter <[email protected]> + + * progmodes/python.el (python-guess-indent): Check non-nullness + before comparing indent against the 2..8 interval. + 2007-05-07 YAMAMOTO Mitsuharu <[email protected]> * term/mac-win.el (mac-ts-unicode-for-key-event): Check if text is @@ -27,9 +32,9 @@ 2007-04-29 Davis Herring <[email protected]> - * 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 <[email protected]> diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index e57c7e639c..17d30e0d97 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -461,7 +461,7 @@ Set `python-indent' locally to the value guessed." (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)) |