Merge pull request #2561 from takluyver/notebook-carriage-return

Fix display of plain text containing multiple carriage returns before line feed

IPython/frontend/html/notebook/static/js/utils.js

@@ -195,7 +195,8 b' IPython.utils = (function (IPython) {'
         tmp = txt;
         do {
             txt = tmp;
-            tmp = txt.replace(/^.*\r(?!\n)/gm, '');
+            tmp = txt.replace(/\r+\n/gm, '\n'); // \r followed by \n --> newline
+            tmp = tmp.replace(/^.*\r+/gm, '');  // Other \r --> clear line
         } while (tmp.length < txt.length);
         return txt;
     }