[Emacs-diffs] [emacs] 01/01: * lisp/progmodes/python.el (python-shell-completion-get-completions): Fix previous merge.

[Fabián Ezequiel Gallina]

fgallina pushed a commit to branch master
in repository emacs.

commit 5d977b968c5d55470daa337df52ca2689d434e3c
Author: Fabián Ezequiel Gallina <address@hidden>
Date:   Fri Nov 14 02:29:40 2014 -0300

    * lisp/progmodes/python.el (python-shell-completion-get-completions):
    Fix previous merge.
---
 lisp/ChangeLog           |    5 +++++
 lisp/progmodes/python.el |    8 ++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7bec543..9c673c8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-14  Fabián Ezequiel Gallina  <address@hidden>
+
+       * progmodes/python.el (python-shell-completion-get-completions):
+       Fix previous merge.
+
 2014-11-14  Lars Magne Ingebrigtsen  <address@hidden>
 
        * 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 b230992..dfefe83 100644
--- 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