[Emacs-diffs] /srv/bzr/emacs/trunk r101782: shr.el (shr-insert): Use string anchors instead of line anchors.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 101782
author: Lars Magne Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Mon 2010-10-04 07:42:58 +0000
message:
  shr.el (shr-insert): Use string anchors instead of line anchors.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/shr.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-10-04 00:17:16 +0000
+++ b/lisp/gnus/ChangeLog       2010-10-04 07:42:58 +0000
@@ -1,3 +1,7 @@
+2010-10-04  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * shr.el (shr-insert): Use string anchors instead of line anchors.
+
 2010-10-03  Lars Magne Ingebrigtsen  <address@hidden>
 
        * shr.el: Add headings.

=== modified file 'lisp/gnus/shr.el'
--- a/lisp/gnus/shr.el  2010-10-04 00:17:16 +0000
+++ b/lisp/gnus/shr.el  2010-10-04 07:42:58 +0000
@@ -237,7 +237,7 @@
    (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 @@
        (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 " "))))))