mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 18:40:39 -08:00
Code Issues Projects Releases Wiki Activity

* 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

5
lisp/ChangeLog
View file

@ -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> 2014-11-14 Lars Magne Ingebrigtsen <larsi@gnus.org>
* net/eww.el (eww-render): Don't set the title to the URL. * net/eww.el (eww-render): Don't set the title to the URL.

8
lisp/progmodes/python.el
View file

@ -2886,13 +2886,9 @@ When IMPORT is non-nil takes precedence over INPUT for
completion." completion."
(with-current-buffer (process-buffer process) (with-current-buffer (process-buffer process)
(let* ((prompt (let* ((prompt
;; Get last prompt of the inferior process buffer (this (let ((prompt-boundaries (python-util-comint-last-prompt)))
;; intentionally avoids using `comint-last-prompt' because
;; of incompatibilities with Emacs 24.x).
(save-excursion
(buffer-substring-no-properties (buffer-substring-no-properties
(line-beginning-position) ;End of prompt. (car prompt-boundaries) (cdr prompt-boundaries))))
(re-search-backward "^"))))
(completion-code (completion-code
;; 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