2 files changed, 13 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5f799a25b32..d679b5867a8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-03  Dave Love  <fx@gnu.org>
+
+        * progmodes/python.el (python-beginning-of-statement):
+        Loop at least once (fixes 2008-02-21 change).
+
 2008-05-03  Eli Zaretskii  <eliz@gnu.org>
 
         * ls-lisp.el (ls-lisp-insert-directory): Use `string-width'
@@ -5,10 +10,10 @@
 
 2008-05-03  Eric S. Raymond  <esr@snark.thyrsus.com>
 
-        * vc-dispatcher.el: New file, separates out the UI and command 
+        * vc-dispatcher.el: New file, separates out the UI and command
         execution machinery from VCS-specific logic left in vc.el.  The
         separation is not yet completely clean, but it's a good start.
-        * vc.el: This file is about 1700 lines shorter now.  Obsolete 
+        * vc.el: This file is about 1700 lines shorter now.  Obsolete
         logentry-check is removed from the backend API.
         * vc-sccs.el: Obsolete vc-sccs-logentry-check removed.  This was
         was the only implementation of the logentry-check method, and
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 15dc73daba4..36bc1178288 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -977,9 +977,11 @@ Accounts for continuation lines, multi-line strings, and
 multi-line bracketed expressions."
   (beginning-of-line)
   (python-beginning-of-string)
-  (let ((point (point)))
+  (let (point)
     (while (and (python-continuation-line-p)
-                (> point (setq point (point))))
+                (if point
+                    (< (point) point)
+                  t))
       (beginning-of-line)
       (if (python-backslash-continuation-line-p)
           (progn
@@ -987,7 +989,8 @@ multi-line bracketed expressions."
             (while (python-backslash-continuation-line-p)
               (forward-line -1)))
         (python-beginning-of-string)
-        (python-skip-out))))
+        (python-skip-out))
+      (setq point (point))))
   (back-to-indentation))
 
 (defun python-skip-out (&optional forward syntax)