From: Andrii Kolomoiets Date: Tue, 19 Feb 2019 21:57:07 +0000 (+0200) Subject: Make python-shell-prompt-block-regexp match IPython prompt X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~19^2~3624 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6f8fe0d5acf0aa62a39b274217ac28fc1764840e;p=emacs.git Make python-shell-prompt-block-regexp match IPython prompt * lisp/progmodes/python.el (python-shell-prompt-block-regexp): Match also IPython's multiline prompt. It allows to correctly disable non-native completions during multiline statement in inferior-python-mode that runs IPython interpreter (Bug#34582). Copyright-paperwork-exempt: yes --- diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index b05f9a33e90..5193501f716 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -2003,7 +2003,7 @@ position, else returns nil." It should not contain a caret (^) at the beginning." :type 'string) -(defcustom python-shell-prompt-block-regexp "\\.\\.\\. " +(defcustom python-shell-prompt-block-regexp "\\.\\.\\.:? " "Regular expression matching block input prompt of Python shell. It should not contain a caret (^) at the beginning." :type 'string)