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

1 files changed, 1 insertions, 1 deletions

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index e57c7e639c9..17d30e0d972 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))