* progmodes/python.el (python-shell-output-filter): Handle extra

carriage return in OSX.

Fixes: debbugs:12409
parent a5b773c4
2012-10-08 Fabián Ezequiel Gallina <fgallina@cuca>
* progmodes/python.el (python-shell-output-filter): Handle extra
carriage return in OSX (Bug#12409).
2012-10-08 Fabián Ezequiel Gallina <fgallina@cuca>
Fix shell handling of unbalanced quotes and parens in output.
......
......@@ -1866,7 +1866,9 @@ detecting a prompt at the end of the buffer."
python-shell-output-filter-buffer
(concat python-shell-output-filter-buffer string))
(when (string-match
(format "\n\\(?:%s\\|%s\\|%s\\)$"
;; XXX: It seems on OSX an extra carriage return is attached
;; at the end of output, this handles that too.
(format "\r?\n\\(?:%s\\|%s\\|%s\\)$"
python-shell-prompt-regexp
python-shell-prompt-block-regexp
python-shell-prompt-pdb-regexp)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment