* lisp/progmodes/python.el (python-shell-completion-get-completions):

Fix previous merge.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7bec543fd4de38f93c0500d64259a74c61f00a56..9c673c861d91eb51ad8da4afbb6ac9a6626d84a6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-14  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+
+       * progmodes/python.el (python-shell-completion-get-completions):
+       Fix previous merge.
+
 2014-11-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * net/eww.el (eww-render): Don't set the title to the URL.

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index b230992fc98fcf5e061b28aa39910433e4564756..dfefe8375695623f008668453ccb42cd1ba90ce9 100644 (file)
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2886,13 +2886,9 @@ When IMPORT is non-nil takes precedence over INPUT for
 completion."
   (with-current-buffer (process-buffer process)
     (let* ((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
+            (let ((prompt-boundaries (python-util-comint-last-prompt)))
               (buffer-substring-no-properties
-               (line-beginning-position) ;End of prompt.
-               (re-search-backward "^"))))
+               (car prompt-boundaries) (cdr prompt-boundaries))))
            (completion-code
             ;; Check whether a prompt matches a pdb string, an import
             ;; statement or just the standard prompt and use the