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

carriage return in OSX.

Fixes: debbugs:12409

2 files changed, 8 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1d7d2af60c7..d3275ce3671 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 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.
         * progmodes/python.el (python-rx-constituents): Added
         string-delimiter.
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."
    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)