aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2010-10-04 07:42:58 +0000
committerKatsumi Yamaoka2010-10-04 07:42:58 +0000
commit23179cb9f1f9ebc442e5feef277d264cdf561c70 (patch)
tree37bf1adc3354a7a1c088de854a456015d30b6b73
parentb4593555945cb23a37bde10e9de93e4cdde5cc13 (diff)
downloademacs-23179cb9f1f9ebc442e5feef277d264cdf561c70.tar.gz
emacs-23179cb9f1f9ebc442e5feef277d264cdf561c70.zip
shr.el (shr-insert): Use string anchors instead of line anchors.
-rw-r--r--lisp/gnus/ChangeLog4
-rw-r--r--lisp/gnus/shr.el4
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 17befd37e61..07e2963107f 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
12010-10-04 Lars Magne Ingebrigtsen <larsi@gnus.org>
2
3 * shr.el (shr-insert): Use string anchors instead of line anchors.
4
12010-10-03 Lars Magne Ingebrigtsen <larsi@gnus.org> 52010-10-03 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 6
3 * shr.el: Add headings. 7 * shr.el: Add headings.
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index faeb16a7c01..118afe2f3e5 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -237,7 +237,7 @@ fit these criteria."
237 (t 237 (t
238 (let ((first t) 238 (let ((first t)
239 column) 239 column)
240 (when (and (string-match "^[ \t\n]" text) 240 (when (and (string-match "\\`[ \t\n]" text)
241 (not (bolp))) 241 (not (bolp)))
242 (insert " ")) 242 (insert " "))
243 (dolist (elem (split-string text)) 243 (dolist (elem (split-string text))
@@ -258,7 +258,7 @@ fit these criteria."
258 (unless shr-start 258 (unless shr-start
259 (setq shr-start (point))) 259 (setq shr-start (point)))
260 (insert elem)) 260 (insert elem))
261 (when (and (string-match "[ \t\n]$" text) 261 (when (and (string-match "[ \t\n]\\'" text)
262 (not (bolp))) 262 (not (bolp)))
263 (insert " ")))))) 263 (insert " "))))))
264 264