X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=FLIM-ELS;h=418c328e3db4a83a4cf8f54918c44d7509018ee4;hb=f64e139c5380c9b142e90dc9c308bf525a45c8a2;hp=3e8e347a1220e013bba5cb100ba32cc69d0e8ba5;hpb=2705bffeacccea18de17e2aeeacf03b7bc2e3ca9;p=elisp%2Fflim.git

diff --git a/FLIM-ELS b/FLIM-ELS
index 3e8e347..418c328 100644
--- a/FLIM-ELS
+++ b/FLIM-ELS
@@ -5,21 +5,23 @@
 ;;; Code:
 
 (setq flim-modules '(std11
-		     mime-def
-		     mel mel-b mel-q mel-u mel-g
+		     luna mime-def
+		     mel mel-q mel-u mel-g
 		     eword-decode eword-encode
-		     mime mime-parse mmgeneric mmbuffer mmcooked
-		     mailcap))
+		     mime mime-parse mmbuffer mmcooked
+		     mailcap
+		     smtp smtpmail))
 
-(if (fboundp 'dynamic-link)
-    (setq flim-modules (cons 'mel-b-dl flim-modules))
+(unless (and (fboundp 'base64-encode-string)
+	     (subrp (symbol-function 'base64-encode-string)))
+  (if (fboundp 'dynamic-link)
+      (setq flim-modules (cons 'mel-b-dl flim-modules))
+    )
+  (setq flim-modules (cons 'mel-b-el flim-modules))
   )
 
-(if (and (featurep 'mule)
-	 (not (or (and (boundp 'MULE) MULE)
-		  (and (featurep 'xemacs) (< emacs-major-version 21))
-		  )))
-    (setq flim-modules (cons 'mel-ccl flim-modules))
-  )
+(require 'pccl)
+(unless-broken ccl-usable
+  (setq flim-modules (cons 'mel-b-ccl (cons 'mel-q-ccl flim-modules))))
 
 ;;; FLIM-ELS ends here