procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Drop use of deleted `comint-last-prompt-overlay'.
This commit is contained in:
Fabián Ezequiel Gallina 2013-09-02 00:21:13 -03:00
parent a892a94c42
commit cd16c5f1f5
2 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -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> 2013-09-01 Glenn Morris <rgm@gnu.org>
* Makefile.in (setwins, setwins_almost, setwins_for_subdirs): * Makefile.in (setwins, setwins_almost, setwins_for_subdirs):

16
lisp/progmodes/python.el
View file

@ -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 LINE is used to detect the context on how to complete given
INPUT." INPUT."
(let* ((prompt (let* ((prompt
;; Get the last prompt for the inferior process ;; Get last prompt of the inferior process buffer (this
;; buffer. This is used for the completion code selection ;; intentionally avoids using `comint-last-prompt' because
;; heuristic. ;; of incompatibilities with Emacs 24.x).
(with-current-buffer (process-buffer process) (with-current-buffer (process-buffer process)
(buffer-substring-no-properties (save-excursion
(overlay-start comint-last-prompt-overlay) (buffer-substring-no-properties
(overlay-end comint-last-prompt-overlay)))) (- (point) (length line))
(progn
(re-search-backward "^")
(python-util-forward-comment)
(point))))))
(completion-context (completion-context
;; Check whether a prompt matches a pdb string, an import ;; Check whether a prompt matches a pdb string, an import
;; statement or just the standard prompt and use the ;; statement or just the standard prompt and use the