Mercurial > emacs
changeset 110045:2758282288b9
Use gnus-create-image to be XEmacs-compatible; Don't do images on non-graphic displays; by Lars Magne Ingebrigtsen <larsi@gnus.org>.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Tue, 31 Aug 2010 00:07:40 +0000 |
| parents | a53fffd298ac |
| children | 1024e1d80019 |
| files | lisp/gnus/ChangeLog lisp/gnus/gnus-html.el |
| diffstat | 2 files changed, 22 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Mon Aug 30 23:53:47 2010 +0000 +++ b/lisp/gnus/ChangeLog Tue Aug 31 00:07:40 2010 +0000 @@ -1,5 +1,9 @@ 2010-08-30 Lars Magne Ingebrigtsen <larsi@gnus.org> + * gnus-html.el (gnus-html-put-image): Use gnus-create-image to be + XEmacs-compatible. + (gnus-html-put-image): Don't do images on non-graphic displays. + * nnslashdot.el: Removed this unused backend. * gnus-undo.el (gnus-undo-register-1): Limit the undo actions to 100
--- a/lisp/gnus/gnus-html.el Mon Aug 30 23:53:47 2010 +0000 +++ b/lisp/gnus/gnus-html.el Tue Aug 31 00:07:40 2010 +0000 @@ -162,21 +162,24 @@ (gnus-html-schedule-image-fetching buffer images))))) (defun gnus-html-put-image (file point) - (let ((image (ignore-errors - (create-image file)))) - (if (and image - ;; Kludge to avoid displaying 30x30 gif images, which - ;; seems to be a signal of a broken image. - (not (and (eq (getf (cdr image) :type) 'gif) - (= (car (image-size image t)) 30) - (= (cdr (image-size image t)) 30)))) - (progn - (gnus-put-image image nil nil point) - t) - (when (fboundp 'find-image) - (gnus-put-image (find-image '((:type xpm :file "lock-broken.xpm"))) - nil nil point)) - nil))) + (when (display-graphic-p) + (let ((image (ignore-errors + (gnus-create-image file)))) + (save-excursion + (goto-char point) + (if (and image + ;; Kludge to avoid displaying 30x30 gif images, which + ;; seems to be a signal of a broken image. + (not (and (eq (getf (cdr image) :type) 'gif) + (= (car (image-size image t)) 30) + (= (cdr (image-size image t)) 30)))) + (progn + (gnus-put-image image) + t) + (when (fboundp 'find-image) + (gnus-put-image (find-image + '((:type xpm :file "lock-broken.xpm"))))) + nil))))) (defun gnus-html-prune-cache () (let ((total-size 0)