diff options
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 2956bfa0419..0482cd78dc4 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -1993,7 +1993,7 @@ position, else returns nil." | |||
| 1993 | ;; IPython prompts activated, this adds some safeguard for that. | 1993 | ;; IPython prompts activated, this adds some safeguard for that. |
| 1994 | "In : " "\\.\\.\\.: ") | 1994 | "In : " "\\.\\.\\.: ") |
| 1995 | "List of regular expressions matching input prompts." | 1995 | "List of regular expressions matching input prompts." |
| 1996 | :type '(repeat string) | 1996 | :type '(repeat regexp) |
| 1997 | :version "24.4") | 1997 | :version "24.4") |
| 1998 | 1998 | ||
| 1999 | (defcustom python-shell-prompt-output-regexps | 1999 | (defcustom python-shell-prompt-output-regexps |
| @@ -2001,28 +2001,28 @@ position, else returns nil." | |||
| 2001 | "Out\\[[0-9]+\\]: " ; IPython | 2001 | "Out\\[[0-9]+\\]: " ; IPython |
| 2002 | "Out :") ; ipdb safeguard | 2002 | "Out :") ; ipdb safeguard |
| 2003 | "List of regular expressions matching output prompts." | 2003 | "List of regular expressions matching output prompts." |
| 2004 | :type '(repeat string) | 2004 | :type '(repeat regexp) |
| 2005 | :version "24.4") | 2005 | :version "24.4") |
| 2006 | 2006 | ||
| 2007 | (defcustom python-shell-prompt-regexp ">>> " | 2007 | (defcustom python-shell-prompt-regexp ">>> " |
| 2008 | "Regular expression matching top level input prompt of Python shell. | 2008 | "Regular expression matching top level input prompt of Python shell. |
| 2009 | It should not contain a caret (^) at the beginning." | 2009 | It should not contain a caret (^) at the beginning." |
| 2010 | :type 'string) | 2010 | :type 'regexp) |
| 2011 | 2011 | ||
| 2012 | (defcustom python-shell-prompt-block-regexp "\\.\\.\\.:? " | 2012 | (defcustom python-shell-prompt-block-regexp "\\.\\.\\.:? " |
| 2013 | "Regular expression matching block input prompt of Python shell. | 2013 | "Regular expression matching block input prompt of Python shell. |
| 2014 | It should not contain a caret (^) at the beginning." | 2014 | It should not contain a caret (^) at the beginning." |
| 2015 | :type 'string) | 2015 | :type 'regexp) |
| 2016 | 2016 | ||
| 2017 | (defcustom python-shell-prompt-output-regexp "" | 2017 | (defcustom python-shell-prompt-output-regexp "" |
| 2018 | "Regular expression matching output prompt of Python shell. | 2018 | "Regular expression matching output prompt of Python shell. |
| 2019 | It should not contain a caret (^) at the beginning." | 2019 | It should not contain a caret (^) at the beginning." |
| 2020 | :type 'string) | 2020 | :type 'regexp) |
| 2021 | 2021 | ||
| 2022 | (defcustom python-shell-prompt-pdb-regexp "[(<]*[Ii]?[Pp]db[>)]+ " | 2022 | (defcustom python-shell-prompt-pdb-regexp "[(<]*[Ii]?[Pp]db[>)]+ " |
| 2023 | "Regular expression matching pdb input prompt of Python shell. | 2023 | "Regular expression matching pdb input prompt of Python shell. |
| 2024 | It should not contain a caret (^) at the beginning." | 2024 | It should not contain a caret (^) at the beginning." |
| 2025 | :type 'string) | 2025 | :type 'regexp) |
| 2026 | 2026 | ||
| 2027 | (define-obsolete-variable-alias | 2027 | (define-obsolete-variable-alias |
| 2028 | 'python-shell-enable-font-lock 'python-shell-font-lock-enable "25.1") | 2028 | 'python-shell-enable-font-lock 'python-shell-font-lock-enable "25.1") |
| @@ -2111,7 +2111,7 @@ virtualenv." | |||
| 2111 | "(" (group (1+ digit)) ")" (1+ (not (any "("))) "()") | 2111 | "(" (group (1+ digit)) ")" (1+ (not (any "("))) "()") |
| 2112 | 1 2)) | 2112 | 1 2)) |
| 2113 | "`compilation-error-regexp-alist' for inferior Python." | 2113 | "`compilation-error-regexp-alist' for inferior Python." |
| 2114 | :type '(alist string) | 2114 | :type '(alist regexp) |
| 2115 | :group 'python) | 2115 | :group 'python) |
| 2116 | 2116 | ||
| 2117 | (defmacro python-shell--add-to-path-with-priority (pathvar paths) | 2117 | (defmacro python-shell--add-to-path-with-priority (pathvar paths) |
| @@ -3785,7 +3785,7 @@ the top stack frame has been reached. | |||
| 3785 | 3785 | ||
| 3786 | Filename is expected in the first parenthesized expression. | 3786 | Filename is expected in the first parenthesized expression. |
| 3787 | Line number is expected in the second parenthesized expression." | 3787 | Line number is expected in the second parenthesized expression." |
| 3788 | :type 'string | 3788 | :type 'regexp |
| 3789 | :version "27.1" | 3789 | :version "27.1" |
| 3790 | :safe 'stringp) | 3790 | :safe 'stringp) |
| 3791 | 3791 | ||