aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/progmodes/python.el
diff options
context:
space:
mode:
authorAndrii Kolomoiets2019-02-19 23:57:07 +0200
committerNoam Postavsky2019-04-16 20:09:34 -0400
commit6f8fe0d5acf0aa62a39b274217ac28fc1764840e (patch)
tree2a6972aeed416930d5293fcd8edaca48684e52da /lisp/progmodes/python.el
parent6fe81676f314c0ba7ef627e864dea27f57953eec (diff)
downloademacs-6f8fe0d5acf0aa62a39b274217ac28fc1764840e.tar.gz
emacs-6f8fe0d5acf0aa62a39b274217ac28fc1764840e.zip
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
Diffstat (limited to 'lisp/progmodes/python.el')
-rw-r--r--lisp/progmodes/python.el2
1 files changed, 1 insertions, 1 deletions
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."
2003It should not contain a caret (^) at the beginning." 2003It should not contain a caret (^) at the beginning."
2004 :type 'string) 2004 :type 'string)
2005 2005
2006(defcustom python-shell-prompt-block-regexp "\\.\\.\\. " 2006(defcustom python-shell-prompt-block-regexp "\\.\\.\\.:? "
2007 "Regular expression matching block input prompt of Python shell. 2007 "Regular expression matching block input prompt of Python shell.
2008It should not contain a caret (^) at the beginning." 2008It should not contain a caret (^) at the beginning."
2009 :type 'string) 2009 :type 'string)