* lisp/progmodes/python.el (python-indent-guess-indent-offset):

Avoid corner-case error.

Fixes: debbugs:15975

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fd41ed84d64dd83304dae2cad3ab3ea4e9e3a9e9..4e6442f89525de882d0ed12d7e2560b3df39076e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2013-11-26  Glenn Morris  <rgm@gnu.org>
 
+       * progmodes/python.el (python-indent-guess-indent-offset):
+       Avoid corner-case error.  (Bug#15975)
+
        Preload leim-list.el.  (Bug#4789)
        * loadup.el: Load leim-list.el when found.
        * startup.el (normal-top-level): Skip re-loading leim/leim-list.el.

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 8dc345ca1c1f30b3b9a446d2d37be455c66b79fc..458f0f16fb63cb1335a5ffecf37eeb0fb24a5ccc 100644 (file)
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -676,7 +676,7 @@ AFTER-LINE.")
                  (goto-char block-end)
                  (python-util-forward-comment)
                  (current-indentation))))
-          (if indentation
+          (if (and indentation (not (zerop indentation)))
               (set (make-local-variable 'python-indent-offset) indentation)
             (message "Can't guess python-indent-offset, using defaults: %s"
                      python-indent-offset)))))))