From: Dave Love <fx@gnu.org>
Date: Wed, 8 Nov 2000 23:53:59 +0000 (+0000)
Subject: Use featurep for XEmacs test.
X-Git-Tag: emacs-pretest-21.0.90~198
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=722a8409553518c10458345289329cc59833b9e3;p=emacs.git

Use featurep for XEmacs test.
(mm-inline-message): Test for `remove-specifier'; don't use
condition-case.
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index e86be2db8cf..bd3cc2dbe2f 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -36,6 +36,10 @@
 
 2000-11-08  Dave Love  <fx@gnu.org>
 
+	* mm-view.el: Use featurep for XEmacs test.
+	(mm-inline-message): Test for `remove-specifier'; don't use
+	condition-case.
+
 	* mm-bodies.el (mm-encode-body): Use mm-multibyte-p.
 
 	* gnus-score.el (gnus-score-load-file): Use expand-file-name.
diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el
index 5bf4f09e3b9..9f389ba7e3a 100644
--- a/lisp/gnus/mm-view.el
+++ b/lisp/gnus/mm-view.el
@@ -64,7 +64,7 @@
     (set-extent-property annot 'duplicable t)))
 
 (eval-and-compile
-  (if (string-match "XEmacs" (emacs-version))
+  (if (featurep 'xemacs)
       (defalias 'mm-inline-image 'mm-inline-image-xemacs)
     (defalias 'mm-inline-image 'mm-inline-image-emacs)))
 
@@ -251,13 +251,12 @@
 	 handle
 	 `(lambda ()
 	    (let (buffer-read-only)
-	      (condition-case nil
+	      (if (fboundp 'remove-specifier)
 		  ;; This is only valid on XEmacs.
 		  (mapcar (lambda (prop)
 			    (remove-specifier
 			     (face-property 'default prop) (current-buffer)))
-			  '(background background-pixmap foreground))
-		(error nil))
+			  '(background background-pixmap foreground)))
 	      (delete-region ,(point-min-marker) ,(point-max-marker)))))))))
 
 (defun mm-display-inline-fontify (handle mode)