[Emacs-diffs] /srv/bzr/emacs/trunk r110473: * progmodes/python.el (python-shell-output-filter): Handle extra

[Fabián Ezequiel Gallina]

------------------------------------------------------------
revno: 110473
fixes bug: http://debbugs.gnu.org/12409
committer: Fabián Ezequiel Gallina <address@hidden>
branch nick: trunk
timestamp: Mon 2012-10-08 18:51:02 -0300
message:
  * progmodes/python.el (python-shell-output-filter): Handle extra
  carriage return in OSX.
modified:
  lisp/ChangeLog
  lisp/progmodes/python.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-10-08 21:30:36 +0000
+++ b/lisp/ChangeLog    2012-10-08 21:51:02 +0000
@@ -1,5 +1,10 @@
 2012-10-08  Fabián Ezequiel Gallina  <address@hidden>
 
+       * progmodes/python.el (python-shell-output-filter): Handle extra
+       carriage return in OSX (Bug#12409).
+
+2012-10-08  Fabián Ezequiel Gallina  <address@hidden>
+
        Fix shell handling of unbalanced quotes and parens in output.
        * progmodes/python.el (python-rx-constituents): Added
        string-delimiter.

=== modified file 'lisp/progmodes/python.el'
--- a/lisp/progmodes/python.el  2012-10-08 21:30:36 +0000
+++ b/lisp/progmodes/python.el  2012-10-08 21:51:02 +0000
@@ -1866,7 +1866,9 @@
    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)