shr.el (shr-insert): \r is also not inserted, so don't try to delete it

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index f79353ebfb3ec11e028b45de7d4247bc1220d9a7..c6b2a4c37a784417b3fbb380c600f5a190025356 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-09  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * shr.el (shr-insert): \r is also not inserted, so don't try to delete
+       it.
+
 2012-10-06  Glenn Morris  <rgm@gnu.org>
 
        * gnus-notifications.el (gnus-notifications):

diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index e7a6c5d20810b3bd0c4a7db432acb02859189532..03704554459347655de310376b980da747174587 100644 (file)
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -391,7 +391,7 @@ size, and full-buffer size."
            (shr-indent))
          (end-of-line))
        (insert " ")))
-    (unless (string-match "[ \t\n ]\\'" text)
+    (unless (string-match "[ \t\r\n ]\\'" text)
       (delete-char -1)))))
 
 (defun shr-find-fill-point ()