Commit 5d977b96 authored by Fabián Ezequiel Gallina's avatar Fabián Ezequiel Gallina
Browse files

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

Fix previous merge.
parent f48827ad
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>
* net/eww.el (eww-render): Don't set the title to the URL.
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment