commit d07342afa746c44f10a0ae1aa344b3c31b28cfdf
Author: Mike Sperber <sperber@deinprogramm.de>
Date:   Tue Oct 20 11:05:57 2015 +0200

    	* mailcap.el (mailcap-mime-data): Conditonalize `doc-view-mode', which
    	does not exist on XEmacs.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 979a845..3e2f0e1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-20  Michael Sperber  <mike@xemacs.org>
+
+	* mailcap.el (mailcap-mime-data): Conditonalize `doc-view-mode', which
+	does not exist on XEmacs.
+
 2015-10-18  Michael Sperber  <mike@xemacs.org>
 
 	* nnml.el (nnml-retrieve-groups, nnml-request-scan): 
diff --git a/lisp/mailcap.el b/lisp/mailcap.el
index 9f84413..a3348c6 100644
--- a/lisp/mailcap.el
+++ b/lisp/mailcap.el
@@ -160,7 +160,8 @@ This is a compatibility function for different Emacsen."
      ("pdf"
       (viewer . doc-view-mode)
       (type . "application/pdf")
-      (test . (eq window-system 'x)))
+      (test . (and (fboundp 'doc-view-mode)
+		   (eq window-system 'x))))
      ("pdf"
       (viewer . "gv -safer %s")
       (type . "application/pdf")