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

Merge from emacs-24; up to 2014-07-26T11:58:24Z!schwab@linux-m68k.org

Browse source
This commit is contained in:
Glenn Morris 2014-10-12 15:56:45 -07:00
commit b1d5ab0352
22 changed files with 104 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lisp/progmodes/python.el
View file

@ -2886,9 +2886,13 @@ When IMPORT is non-nil takes precedence over INPUT for
completion."
(with-current-buffer (process-buffer process)
(let* ((prompt
(let ((prompt-boundaries (python-util-comint-last-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
(buffer-substring-no-properties
(car prompt-boundaries) (cdr prompt-boundaries))))
(line-beginning-position) ;End of prompt.
(re-search-backward "^"))))
(completion-code
;; Check whether a prompt matches a pdb string, an import
;; statement or just the standard prompt and use the