Mercurial > emacs
comparison lisp/gnus/gnus-html.el @ 111830:79219ca01c7b
Merge changes made in Gnus trunk.
nnir.el (nnir-categorize): Replace mapcar with mapc.
shr.el (shr-urlify): Display the title in <a> tags.
shr.el (shr-urlify): Show the URL before the title to avoid misleading URLs.
gnus-sum.el (gnus-summary-show-article): Reverse the meanings of `C-u
C-u g' and `C-u g' so that `C-u g' does what it traditionally did.
gnus.texi (Paging the Article): Note the reverse meanings of `C-u C-u g'.
gnus-html.el (gnus-html-put-image): Use widget instead of local maps
so that TAB works.
nnir.el (nnir-run-gmane): Use more careful test for gmane nntp server.
nnimap.el (nnimap-process-expiry-targets): Avoid downloading articles
unless necessary.
gnus-util.el (gnus-output-to-mail): Require nnmail before using nnmail
variables.
shr.el (shr-stylesheet): New dynamic variable for cascading the styles.
(shr-colorize-region): New function.
(shr-insert-background-overlay): Remove.
(shr-render-td): Background setting should be taken care of on a higher level.
(shr-tag-body): Use post-hoc colorizations.
(shr-descend): Only render color/background when they change.
(shr-tag-body): Set up a style sheet based on bgcolor/fgcolor.
(shr-put-color-1): Don't overwrite old colors.
(shr-colorize-region): When the background color isn't explicit, use a fixed background.
gnus.el (gnus-valid-select-methods): Allow nnimap to respool.
nntp.el (nntp-snarf-error-message): nnheader-report takes a format string as the parameter.
gnus-sum.el (gnus-summary-respool-article): The completion function expects a list instead of an alist.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Sun, 05 Dec 2010 22:17:34 +0000 |
parents | b8f48ecba2e7 |
children | faa4a1c986c6 |
comparison
equal
deleted
inserted
replaced
111829:a60f0af8cb39 | 111830:79219ca01c7b |
---|---|
197 (list 'image-url url | 197 (list 'image-url url |
198 'image-displayer `(lambda (url start end) | 198 'image-displayer `(lambda (url start end) |
199 (gnus-html-display-image url start end | 199 (gnus-html-display-image url start end |
200 ,alt-text)) | 200 ,alt-text)) |
201 'gnus-image (list url start end alt-text))) | 201 'gnus-image (list url start end alt-text))) |
202 (gnus-overlay-put (gnus-make-overlay start end) | 202 (widget-convert-button |
203 'local-map gnus-html-image-map) | 203 'url-link start (point) |
204 :help-echo alt-text | |
205 :keymap gnus-html-image-map | |
206 url) | |
204 (if (string-match "\\`cid:" url) | 207 (if (string-match "\\`cid:" url) |
205 ;; URLs with cid: have their content stashed in other | 208 ;; URLs with cid: have their content stashed in other |
206 ;; parts of the MIME structure, so just insert them | 209 ;; parts of the MIME structure, so just insert them |
207 ;; immediately. | 210 ;; immediately. |
208 (let* ((handle (mm-get-content-id (substring url (match-end 0)))) | 211 (let* ((handle (mm-get-content-id (substring url (match-end 0)))) |
471 (= (cdr size) 30)))) | 474 (= (cdr size) 30)))) |
472 ;; Good image, add it! | 475 ;; Good image, add it! |
473 (let ((image (gnus-rescale-image image (gnus-html-maximum-image-size)))) | 476 (let ((image (gnus-rescale-image image (gnus-html-maximum-image-size)))) |
474 (delete-region start end) | 477 (delete-region start end) |
475 (gnus-put-image image alt-text 'external) | 478 (gnus-put-image image alt-text 'external) |
476 (gnus-put-text-property start (point) 'help-echo alt-text) | 479 (widget-convert-button |
477 (gnus-overlay-put | 480 'url-link start (point) |
478 (gnus-make-overlay start (point)) 'local-map | 481 :help-echo alt-text |
479 gnus-html-displayed-image-map) | 482 :keymap gnus-html-displayed-image-map |
483 url) | |
480 (gnus-put-text-property start (point) | 484 (gnus-put-text-property start (point) |
481 'gnus-alt-text alt-text) | 485 'gnus-alt-text alt-text) |
482 (when url | 486 (when url |
483 (gnus-put-text-property start (point) | 487 (gnus-put-text-property start (point) |
484 'image-url url)) | 488 'image-url url)) |