diff options
| author | Glenn Morris | 2019-07-06 12:51:30 -0700 |
|---|---|---|
| committer | Glenn Morris | 2019-07-06 12:51:30 -0700 |
| commit | bb856d12dc34a56be7a95ca5e55ddb1a78535d07 (patch) | |
| tree | 2123f2d6728d4a043f2b8a07bd5368c010bb7d62 /lisp/progmodes/python.el | |
| parent | ef389fd9a5e6df06b8f7769ab32dc929dc4f0ed4 (diff) | |
| parent | e97c0437aa135f9580cd8cc1ec912758e3610ab1 (diff) | |
| download | emacs-bb856d12dc34a56be7a95ca5e55ddb1a78535d07.tar.gz emacs-bb856d12dc34a56be7a95ca5e55ddb1a78535d07.zip | |
Merge from origin/emacs-26
e97c043 Fix python.el docstring (Bug#36458)
e660801 ; Add thing-at-point-looking-at test (Bug#35708)
f5b4846 ; Fix typo, insure -> ensure in ChangeLogs
cb8fb59 * lisp/hi-lock.el (hi-lock-line-face-buffer): Doc fix. (Bug3...
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index e1f9a33a691..14b65669c4b 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -2274,7 +2274,7 @@ Do not set this variable directly, instead use | |||
| 2274 | (defvar python-shell--prompt-calculated-output-regexp nil | 2274 | (defvar python-shell--prompt-calculated-output-regexp nil |
| 2275 | "Calculated output prompt regexp for inferior python shell. | 2275 | "Calculated output prompt regexp for inferior python shell. |
| 2276 | Do not set this variable directly, instead use | 2276 | Do not set this variable directly, instead use |
| 2277 | `python-shell-set-prompt-regexp'.") | 2277 | `python-shell-prompt-set-calculated-regexps'.") |
| 2278 | 2278 | ||
| 2279 | (defun python-shell-prompt-detect () | 2279 | (defun python-shell-prompt-detect () |
| 2280 | "Detect prompts for the current `python-shell-interpreter'. | 2280 | "Detect prompts for the current `python-shell-interpreter'. |