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

Drop use of deleted `comint-last-prompt-overlay'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index be8caf189d22ff684d2295557ecf2dd823f87d87..b48ff2f5030b3285d08c56595e3dce135a35bc02 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-02  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+
+       * progmodes/python.el (python-shell-completion-get-completions):
+       Drop use of deleted `comint-last-prompt-overlay'.
+
 2013-09-01  Glenn Morris  <rgm@gnu.org>
 
        * Makefile.in (setwins, setwins_almost, setwins_for_subdirs):

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 7004836e69f3f07479f0201fdb6ba05bcc59e4e2..b8e2f4c8de9976c5eee33b52b9418818208ec5ef 100644 (file)
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2266,13 +2266,17 @@ and use the following as the value of this variable:
 LINE is used to detect the context on how to complete given
 INPUT."
   (let* ((prompt
-          ;; Get the last prompt for the inferior process
-          ;; buffer. This is used for the completion code selection
-          ;; heuristic.
+          ;; Get last prompt of the inferior process buffer (this
+          ;; intentionally avoids using `comint-last-prompt' because
+          ;; of incompatibilities with Emacs 24.x).
           (with-current-buffer (process-buffer process)
-            (buffer-substring-no-properties
-             (overlay-start comint-last-prompt-overlay)
-             (overlay-end comint-last-prompt-overlay))))
+            (save-excursion
+              (buffer-substring-no-properties
+               (- (point) (length line))
+               (progn
+                 (re-search-backward "^")
+                 (python-util-forward-comment)
+                 (point))))))
          (completion-context
           ;; Check whether a prompt matches a pdb string, an import
           ;; statement or just the standard prompt and use the