mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-30 19:53:09 +00:00
Code Issues Releases Activity

Use gnus-create-image to be XEmacs-compatible; Don't do images on non-graphic displays; by Lars Magne Ingebrigtsen <larsi@gnus.org>.

Browse Source
This commit is contained in:
Katsumi Yamaoka 2010-08-31 00:07:40 +00:00
parent 77ae8989c4
commit fb16bb4689
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/gnus/ChangeLog
View File

@ -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

33
lisp/gnus/gnus-html.el
View File

@ -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)