* lisp/progmodes/python.el (python-nav-beginning-of-statement): Speed

up.

Fixes: debbugs:15295

2 files changed, 20 insertions, 9 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c3185a37a71..1c66a806c5f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-24  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+
+        * progmodes/python.el (python-nav-beginning-of-statement): Speed
+        up (Bug#15295).
+
 2013-12-24  Lars Ingebrigtsen  <larsi@gnus.org>
 
         * net/eww.el (eww-bookmark-browse): Use `quit-window' to restore
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index aeee179c7e7..07a8bba6b18 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1279,15 +1279,21 @@ nested definitions."
 (defun python-nav-beginning-of-statement ()
   "Move to start of current statement."
   (interactive "^")
-  (while (and (or (back-to-indentation) t)
-              (not (bobp))
-              (when (or
-                     (save-excursion
-                       (forward-line -1)
-                       (python-info-line-ends-backslash-p))
-                     (python-syntax-context 'string)
-                     (python-syntax-context 'paren))
-                (forward-line -1))))
+  (back-to-indentation)
+  (let* ((ppss (syntax-ppss))
+         (context-point
+          (or
+           (python-syntax-context 'paren ppss)
+           (python-syntax-context 'string ppss))))
+    (cond ((bobp))
+          (context-point
+           (goto-char context-point)
+           (python-nav-beginning-of-statement))
+          ((save-excursion
+             (forward-line -1)
+             (python-info-line-ends-backslash-p))
+           (forward-line -1)
+           (python-nav-beginning-of-statement))))
   (point-marker))
 
 (defun python-nav-end-of-statement (&optional noend)