[Emacs-diffs] Changes to emacs/lisp/gnus/mm-decode.el,v

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   07/11/16 16:50:36

Index: gnus/mm-decode.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/mm-decode.el,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- gnus/mm-decode.el   28 Oct 2007 09:18:31 -0000      1.45
+++ gnus/mm-decode.el   16 Nov 2007 16:50:32 -0000      1.46
@@ -895,7 +895,7 @@
                          ;; a vector in Emacs but is a list in XEmacs)
                          ;; requires that it is lexically scoped.
                          (timer (run-at-time 2.0 nil 'ignore)))
-                      (if (boundp 'itimer-list)
+                      (if (featurep 'xemacs)
                           (lambda (process state)
                             (when (eq 'exit (process-status process))
                               (if (memq timer itimer-list)
@@ -1364,6 +1364,7 @@
            (mm-handle-set-cache handle spec))))))
 
 (defun mm-create-image-xemacs (type)
+  (when (featurep 'xemacs)
   (cond
    ((equal type "xbm")
     ;; xbm images require special handling, since
@@ -1385,13 +1386,13 @@
      (vector
       (or (mm-image-type-from-buffer)
          (intern type))
-      :data (buffer-string))))))
+       :data (buffer-string)))))))
 
 (defun mm-image-fit-p (handle)
   "Say whether the image in HANDLE will fit the current window."
   (let ((image (mm-get-image handle)))
     (or (not image)
-       (if (fboundp 'glyph-width)
+       (if (featurep 'xemacs)
            ;; XEmacs' glyphs can actually tell us about their width, so
            ;; lets be nice and smart about them.
            (or mm-inline-large-images