Merge from emacs-24; up to 2014-07-26T11:58:24Z!schwab@linux-m68k.org

1 files changed, 6 insertions, 2 deletions

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index dfefe837569..b230992fc98 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2886,9 +2886,13 @@ When IMPORT is non-nil takes precedence over INPUT for
 completion."
   (with-current-buffer (process-buffer process)
     (let* ((prompt
-            (let ((prompt-boundaries (python-util-comint-last-prompt)))
+            ;; Get last prompt of the inferior process buffer (this
+            ;; intentionally avoids using `comint-last-prompt' because
+            ;; of incompatibilities with Emacs 24.x).
+            (save-excursion
               (buffer-substring-no-properties
-               (car prompt-boundaries) (cdr prompt-boundaries))))
+               (line-beginning-position) ;End of prompt.
+               (re-search-backward "^"))))
            (completion-code
             ;; Check whether a prompt matches a pdb string, an import
             ;; statement or just the standard prompt and use the