diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2016-02-11 15:22:45 +1100 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2016-02-11 15:22:45 +1100 |
| commit | 35953890c59f3d7fc6abe4a5f4aefc4c0d005ad4 (patch) | |
| tree | ca2921c103eb5d01b661d371143ba45a4df04a9d /lisp/gnus/gnus-html.el | |
| parent | 395f2ad689825f83702cbadc16b9da83493a9929 (diff) | |
| download | emacs-35953890c59f3d7fc6abe4a5f4aefc4c0d005ad4.tar.gz emacs-35953890c59f3d7fc6abe4a5f4aefc4c0d005ad4.tar.bz2 emacs-35953890c59f3d7fc6abe4a5f4aefc4c0d005ad4.zip | |
Remove Gnus XEmacs compatibility
* lisp/gnus/gnus-demon.el (gnus-demon-idle-since): Remove
XEmacs compat.
* lisp/gnus/gnus-dired.el: Remove XEmacs compat.
* lisp/gnus/gnus-draft.el: Remove XEmacs compat.
* lisp/gnus/gnus-gravatar.el (gnus-gravatar-insert): Remove
XEmacs compat.
* lisp/gnus/gnus-group.el: Remove XEmacs compat.
* lisp/gnus/gnus-html.el: Remove XEmacs compat.
* lisp/gnus/gnus-ml.el: Remove XEmacs compat.
* lisp/gnus/gnus-picon.el (gnus-picon-style): Remove XEmacs comment.
Diffstat (limited to 'lisp/gnus/gnus-html.el')
| -rw-r--r-- | lisp/gnus/gnus-html.el | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el index 9413d4e1b2a..23b8836ac7c 100644 --- a/lisp/gnus/gnus-html.el +++ b/lisp/gnus/gnus-html.el @@ -39,7 +39,7 @@ (require 'xml) (require 'browse-url) (require 'mm-util) -(eval-and-compile (unless (featurep 'xemacs) (require 'help-fns))) +(require 'help-fns) (defcustom gnus-html-image-cache-ttl (days-to-time 7) "Time used to determine if we should use images from the cache." @@ -454,10 +454,7 @@ Return a string with image data." (let* ((image (ignore-errors (gnus-create-image data nil t))) - (size (and image - (if (featurep 'xemacs) - (cons (glyph-width image) (glyph-height image)) - (image-size image t))))) + (size (and image (image-size image t)))) (save-excursion (goto-char start) (let ((alt-text (or alt-text @@ -466,16 +463,8 @@ Return a string with image data." (if (and image ;; Kludge to avoid displaying 30x30 gif images, which ;; seems to be a signal of a broken image. - (not (and (if (featurep 'xemacs) - (glyphp image) - (listp image)) - (eq (if (featurep 'xemacs) - (let ((d (cdadar - (specifier-spec-list - (glyph-image image))))) - (and (vectorp d) - (aref d 0))) - (plist-get (cdr image) :type)) + (not (and (listp image) + (eq (plist-get (cdr image) :type) 'gif) (= (car size) 30) (= (cdr size) 30)))) |