From 45d259e8fd40a21a4ba548dc6a26d5ba7c22607f Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Mon, 10 Dec 2001 05:09:52 +0000
Subject: [PATCH] Fix last change (remove mm-util stuff).

---
 lisp/nnheader.el |   49 ++++++++++++++++++++++++-------------------------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/lisp/nnheader.el b/lisp/nnheader.el
index 3850d1e..ba9b422 100644
--- a/lisp/nnheader.el
+++ b/lisp/nnheader.el
@@ -1183,31 +1183,30 @@ find-file-hooks, etc.
       (message "%s(Y/n) Yes" prompt)
       t)))
 
-(eval-and-compile
-  (unless (featurep 'mm-util)
-    (defun nnheader-image-load-path (&optional package)
-      (let (dir result)
-	(dolist (path load-path (nreverse result))
-	  (if (file-directory-p
-	       (setq dir (concat (file-name-directory
-				  (directory-file-name path))
-				 "etc/" (or package "gnus/"))))
-	      (push dir result))
-	  (push path result))))
-    (defalias 'mm-image-load-path 'nnheader-image-load-path)
-
-    (defalias 'mm-read-coding-system
-      (if (or (and (featurep 'xemacs)
-		   (<= (string-to-number emacs-version) 21.1))
-	      (boundp 'MULE))
-	  (lambda (prompt &optional default-coding-system)
-	    (read-coding-system prompt))
-	'read-coding-system))
-
-    (defalias 'mm-multibyte-string-p
-      (if (fboundp 'multibyte-string-p)
-	  'multibyte-string-p
-	'ignore))))
+(unless (featurep 'mm-util)
+  (defun nnheader-image-load-path (&optional package)
+    (let (dir result)
+      (dolist (path load-path (nreverse result))
+	(if (file-directory-p
+	     (setq dir (concat (file-name-directory
+				(directory-file-name path))
+			       "etc/" (or package "gnus/"))))
+	    (push dir result))
+	(push path result))))
+  (defalias 'mm-image-load-path 'nnheader-image-load-path)
+
+  (defalias 'mm-read-coding-system
+    (if (or (and (featurep 'xemacs)
+		 (<= (string-to-number emacs-version) 21.1))
+	    (boundp 'MULE))
+	(lambda (prompt &optional default-coding-system)
+	  (read-coding-system prompt))
+      'read-coding-system))
+
+  (defalias 'mm-multibyte-string-p
+    (if (fboundp 'multibyte-string-p)
+	'multibyte-string-p
+      'ignore)))
 
 (when (featurep 'xemacs)
   (require 'nnheaderxm))
-- 
1.7.10.4