diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-10-02 09:38:24 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-10-02 09:38:24 -0700 |
| commit | 726eb835ddcbc209545f681d7272ebaa13788b33 (patch) | |
| tree | 48a8efe3696f67cdd5c1258bf83b85d39ab949e9 /lisp/progmodes/python.el | |
| parent | bd080957b069e4ed0e31ce5f029a529432524f46 (diff) | |
| parent | 78eacf31e8fe182801ad1943fac717b75fcf286b (diff) | |
| download | emacs-726eb835ddcbc209545f681d7272ebaa13788b33.tar.gz emacs-726eb835ddcbc209545f681d7272ebaa13788b33.tar.bz2 emacs-726eb835ddcbc209545f681d7272ebaa13788b33.zip | |
Merge from origin/emacs-27
78eacf31e8 ; Fix many typos in symbols in docs and comments
d5d12707d6 * doc/misc/flymake.texi (Using Flymake): Fix a typo. (Bug...
# Conflicts:
# lisp/allout.el
# lisp/progmodes/ebrowse.el
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 3121e5a079d..76baa4469c7 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -2078,7 +2078,7 @@ virtualenv." :group 'python) (defcustom python-shell-setup-codes nil - "List of code run by `python-shell-send-setup-codes'." + "List of code run by `python-shell-send-setup-code'." :type '(repeat symbol) :group 'python) @@ -2378,9 +2378,11 @@ regexps: `python-shell-prompt-regexp', (defun python-shell-prompt-set-calculated-regexps () "Detect and set input and output prompt regexps. -Build and set the values for `python-shell-input-prompt-regexp' -and `python-shell-output-prompt-regexp' using the values from -`python-shell-prompt-regexp', `python-shell-prompt-block-regexp', +Build and set the values for +`python-shell--prompt-calculated-input-regexp' and +`python-shell--prompt-calculated-output-regexp' using the values +from `python-shell-prompt-regexp', +`python-shell-prompt-block-regexp', `python-shell-prompt-pdb-regexp', `python-shell-prompt-output-regexp', `python-shell-prompt-input-regexps', @@ -2442,7 +2444,7 @@ of `python-shell-buffer-name'." (defun python-shell-internal-get-process-name () "Calculate the appropriate process name for Internal Python process. -The name is calculated from `python-shell-global-buffer-name' and +The name is calculated from `python-shell-buffer-name' and the `buffer-name'." (format "%s[%s]" python-shell-internal-buffer-name (buffer-name))) @@ -4717,7 +4719,7 @@ customize how labels are formatted." (defun python-imenu-create-flat-index (&optional alist prefix) "Return flat outline of the current Python buffer for Imenu. Optional argument ALIST is the tree to be flattened; when nil -`python-imenu-build-index' is used with +`python-imenu-create-index' is used with `python-imenu-format-parent-item-jump-label-function' `python-imenu-format-parent-item-label-function' `python-imenu-format-item-label-function' set to |