[Emacs-diffs] /srv/bzr/emacs/trunk r107238: Fix infinite loop in python-end-of-statement

[Leo Liu]

------------------------------------------------------------
revno: 107238
committer: Leo Liu <address@hidden>
branch nick: trunk
timestamp: Sat 2012-02-11 12:20:16 +0800
message:
  Fix infinite loop in python-end-of-statement
  
  http://debbugs.gnu.org/10788
modified:
  lisp/ChangeLog
  lisp/progmodes/python.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-02-10 19:35:28 +0000
+++ b/lisp/ChangeLog    2012-02-11 04:20:16 +0000
@@ -1,3 +1,8 @@
+2012-02-11  Leo Liu  <address@hidden>
+
+       * progmodes/python.el (python-end-of-statement): Fix infinite
+       loop.  (Bug#10788)
+
 2012-02-10  Glenn Morris  <address@hidden>
 
        * international/mule-cmds.el (unify-8859-on-encoding-mode)

=== modified file 'lisp/progmodes/python.el'
--- a/lisp/progmodes/python.el  2012-01-29 07:06:54 +0000
+++ b/lisp/progmodes/python.el  2012-02-11 04:20:16 +0000
@@ -1004,9 +1004,10 @@
                                (error (goto-char pos) (end-of-line)))))
                          ((python-skip-out t s))))
             (end-of-line))
-          (unless comment
-            (eq ?\\ (char-before))))   ; Line continued?
-    (end-of-line 2))                   ; Try next line.
+          (and (not comment)
+               (not (eobp))
+               (eq ?\\ (char-before)))) ; Line continued?
+    (end-of-line 2))                     ; Try next line.
   (point))
 
 (defun python-previous-statement (&optional count)