diff options
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index d35dbc69a48..018d6a7a1f2 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -1866,7 +1866,9 @@ detecting a prompt at the end of the buffer." | |||
| 1866 | python-shell-output-filter-buffer | 1866 | python-shell-output-filter-buffer |
| 1867 | (concat python-shell-output-filter-buffer string)) | 1867 | (concat python-shell-output-filter-buffer string)) |
| 1868 | (when (string-match | 1868 | (when (string-match |
| 1869 | (format "\n\\(?:%s\\|%s\\|%s\\)$" | 1869 | ;; XXX: It seems on OSX an extra carriage return is attached |
| 1870 | ;; at the end of output, this handles that too. | ||
| 1871 | (format "\r?\n\\(?:%s\\|%s\\|%s\\)$" | ||
| 1870 | python-shell-prompt-regexp | 1872 | python-shell-prompt-regexp |
| 1871 | python-shell-prompt-block-regexp | 1873 | python-shell-prompt-block-regexp |
| 1872 | python-shell-prompt-pdb-regexp) | 1874 | python-shell-prompt-pdb-regexp) |