summaryrefslogtreecommitdiff
path: root/lisp/gnus/shr.el
diff options
context:
space:
mode:
authorGnus developers <ding@gnus.org>2010-10-04 10:16:57 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2010-10-04 10:16:57 +0000
commit5d2ef6db45580635e3b816852a0318e747fec0d4 (patch)
tree6d6b40d3397501e0bc8d0ebd83ad5fb1ab945f7b /lisp/gnus/shr.el
parent23179cb9f1f9ebc442e5feef277d264cdf561c70 (diff)
downloademacs-5d2ef6db45580635e3b816852a0318e747fec0d4.tar.gz
emacs-5d2ef6db45580635e3b816852a0318e747fec0d4.tar.bz2
emacs-5d2ef6db45580635e3b816852a0318e747fec0d4.zip
Merge changes made in Gnus trunk.
gnus-html.el (gnus-html-put-image): Fix resize image code. shr.el (shr-ensure-paragraph): Fix the non-empty line case.
Diffstat (limited to 'lisp/gnus/shr.el')
-rw-r--r--lisp/gnus/shr.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index 118afe2f3e5..bfcb91e08c5 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -101,7 +101,7 @@ fit these criteria."
(insert "\n"))
(if (save-excursion
(beginning-of-line)
- (looking-at " *"))
+ (looking-at " *$"))
(insert "\n")
(insert "\n\n")))))