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

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

Browse source 
Fix previous merge.
This commit is contained in:
Fabián Ezequiel Gallina 2014-11-14 02:29:40 -03:00
parent f48827adba
commit 5d977b968c
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lisp/progmodes/python.el
View file

@ -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