diff options
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 2de40c4ab88..035d93f7b99 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -2451,7 +2451,7 @@ the `buffer-name'." | |||
| 2451 | Optional argument TIMEOUT is the timeout argument to | 2451 | Optional argument TIMEOUT is the timeout argument to |
| 2452 | `accept-process-output' calls. Optional argument REGEXP | 2452 | `accept-process-output' calls. Optional argument REGEXP |
| 2453 | overrides the regexp to match the end of output, defaults to | 2453 | overrides the regexp to match the end of output, defaults to |
| 2454 | `comint-prompt-regexp.'. Returns non-nil when output was | 2454 | `comint-prompt-regexp'. Returns non-nil when output was |
| 2455 | properly captured. | 2455 | properly captured. |
| 2456 | 2456 | ||
| 2457 | This utility is useful in situations where the output may be | 2457 | This utility is useful in situations where the output may be |
| @@ -2469,7 +2469,7 @@ banner and the initial prompt are received separately." | |||
| 2469 | (throw 'found t)))))) | 2469 | (throw 'found t)))))) |
| 2470 | 2470 | ||
| 2471 | (defun python-shell-comint-end-of-output-p (output) | 2471 | (defun python-shell-comint-end-of-output-p (output) |
| 2472 | "Return non-nil if OUTPUT is ends with input prompt." | 2472 | "Return non-nil if OUTPUT ends with input prompt." |
| 2473 | (string-match | 2473 | (string-match |
| 2474 | ;; XXX: It seems on macOS an extra carriage return is attached | 2474 | ;; XXX: It seems on macOS an extra carriage return is attached |
| 2475 | ;; at the end of output, this handles that too. | 2475 | ;; at the end of output, this handles that too. |
| @@ -2674,10 +2674,9 @@ With argument MSG show activation/deactivation message." | |||
| 2674 | "Hook run upon first (non-pdb) shell prompt detection. | 2674 | "Hook run upon first (non-pdb) shell prompt detection. |
| 2675 | This is the place for shell setup functions that need to wait for | 2675 | This is the place for shell setup functions that need to wait for |
| 2676 | output. Since the first prompt is ensured, this helps the | 2676 | output. Since the first prompt is ensured, this helps the |
| 2677 | current process to not hang waiting for output by safeguarding | 2677 | current process to not hang while waiting. This is useful to |
| 2678 | interactive actions can be performed. This is useful to safely | 2678 | safely attach setup code for long-running processes that |
| 2679 | attach setup code for long-running processes that eventually | 2679 | eventually provide a shell." |
| 2680 | provide a shell." | ||
| 2681 | :version "25.1" | 2680 | :version "25.1" |
| 2682 | :type 'hook | 2681 | :type 'hook |
| 2683 | :group 'python) | 2682 | :group 'python) |
| @@ -4826,7 +4825,7 @@ With optional argument LINE-NUMBER, check that line instead." | |||
| 4826 | (point-marker))))) | 4825 | (point-marker))))) |
| 4827 | 4826 | ||
| 4828 | (defun python-info-beginning-of-backslash (&optional line-number) | 4827 | (defun python-info-beginning-of-backslash (&optional line-number) |
| 4829 | "Return the point where the backslashed line start. | 4828 | "Return the point where the backslashed line starts. |
| 4830 | Optional argument LINE-NUMBER forces the line number to check against." | 4829 | Optional argument LINE-NUMBER forces the line number to check against." |
| 4831 | (save-excursion | 4830 | (save-excursion |
| 4832 | (save-restriction | 4831 | (save-restriction |