Dave Love <fx at gnu.org>

(python-beginning-of-statement): Loop at least once (fixes 2008-02-21 change).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5f799a25b327bd56dcbdfac6f2ca5b49a307207d..d679b5867a8dc2eebb6bb9598499dd1d376d5903 100644 (file)
--- 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 15dc73daba4dc6c9b55629d34d11d9fac7784232..36bc11782883a86ad4a11c36ad913fa729a652ce 100644 (file)
--- 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)