summaryrefslogtreecommitdiff
path: root/lisp/gnus/gnus-ems.el
diff options
context:
space:
mode:
authorGnus developers <ding@gnus.org>2010-10-04 00:17:16 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2010-10-04 00:17:16 +0000
commita41c2e6d330243fa7b5d1537d5efb211f1c0d30c (patch)
tree5ffaa59adfee8e4fb1b83894e044b7aec9dff128 /lisp/gnus/gnus-ems.el
parent728a982db42d06c3c9db5f920336709387a54cda (diff)
downloademacs-a41c2e6d330243fa7b5d1537d5efb211f1c0d30c.tar.gz
emacs-a41c2e6d330243fa7b5d1537d5efb211f1c0d30c.tar.bz2
emacs-a41c2e6d330243fa7b5d1537d5efb211f1c0d30c.zip
Merge changes made in Gnus trunk.
shr.el: Rename the tag functions a bit, and add some new ones. gnus-sum.el (gnus-summary-select-article-buffer): If the article buffer isn't shown, then select the current article first instead of bugging out. gnus-sum.el (gnus-summary-select-article-buffer): Show both the article and summary buffers again. shr.el (shr-tag-blockquote): Convert name. shr.el (shr-rescale-image): Use the right image-size variant. shr.el (shr-tag-p): Don't insert newlines at the start of the buffer. shr.el: Implement indentation in blockquotes. gnus-sum.el (gnus-summary-select-article-buffer): Really select the article buffer again. shr.el (shr-ensure-paragraph): Don't insert newlines on empty tags at the beginning of the buffer. gnus-ems.el, gnus-util.el, mm-decode.el, mm-view.el: Add resize for large images in mm. gnus-html.el (gnus-html-put-image): Use gnus-rescale-image. shr.el (shr-tag-p): Don't insert newlines on empty tags at the beginning of the buffer. gnus-ems.el, gnus-html.el, gnus-util.el, mm-decode.el, mm-view.el: Support image resizing. shr.el: Add headings. shr.el (shr-ensure-paragraph): Actually work. shr.el (shr-tag-li): Make <ul> prettier. shr.el (shr-insert): Get white space at the beginning/end of elements right. shr.el (shr-tag-li): Tweak <li> rendering. shr.el (shr-tag-p): Collapse subsequent <p>s. shr.el (shr-ensure-paragraph): Don't insert double line feeds after blank lines. shr.el (shr-tag-h6): Add. shr.el (shr-insert): \t is also space.
Diffstat (limited to 'lisp/gnus/gnus-ems.el')
-rw-r--r--lisp/gnus/gnus-ems.el6
1 files changed, 6 insertions, 0 deletions
diff --git a/lisp/gnus/gnus-ems.el b/lisp/gnus/gnus-ems.el
index b4a2fe960c6..e1e37eb37c2 100644
--- a/lisp/gnus/gnus-ems.el
+++ b/lisp/gnus/gnus-ems.el
@@ -307,6 +307,12 @@
end nil))))))
(eval-and-compile
+ ;; XEmacs does not have window-inside-pixel-edges
+ (defalias 'gnus-window-inside-pixel-edges
+ (if (fboundp 'window-inside-pixel-edges)
+ 'window-inside-pixel-edges
+ 'window-pixel-edges))
+
(if (fboundp 'set-process-plist)
(progn
(defalias 'gnus-set-process-plist 'set-process-plist)