(python-guess-indent): Check non-nullness before comparing indent against

the 2..8 interval.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 957e975ded7e9723abb3de563a6d0d13d30adfd3..be19004e9549236b131348a14e09d220071af476 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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>
 

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index e57c7e639c9fa50de3fc844e5873c302552bf5d5..17d30e0d9729704f130b8e49385111d02a3bc64c 100644 (file)
--- 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))