shr.el (shr-insert): Use string anchors instead of line anchors.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 17befd37e611a624f1b987324a90f6cd5e720685..07e2963107f01eabdc1a0f801a2c7e19f723f3f6 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * shr.el (shr-insert): Use string anchors instead of line anchors.
+
 2010-10-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * shr.el: Add headings.

diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index faeb16a7c015e396c66e468018956592ee2fa1aa..118afe2f3e5b4960408c4ec7d0f6ca1a982cf12f 100644 (file)
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -237,7 +237,7 @@ fit these criteria."
    (t
     (let ((first t)
          column)
-      (when (and (string-match "^[ \t\n]" text)
+      (when (and (string-match "\\`[ \t\n]" text)
                 (not (bolp)))
        (insert " "))
       (dolist (elem (split-string text))
@@ -258,7 +258,7 @@ fit these criteria."
        (unless shr-start
          (setq shr-start (point)))
        (insert elem))
-      (when (and (string-match "[ \t\n]$" text)
+      (when (and (string-match "[ \t\n]\\'" text)
                 (not (bolp)))
        (insert " "))))))