projects
/
elisp
/
flim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge flim-1_12_6.
[elisp/flim.git]
/
FLIM-ELS
diff --git
a/FLIM-ELS
b/FLIM-ELS
index
c778f88
..
d389fa4
100644
(file)
--- a/
FLIM-ELS
+++ b/
FLIM-ELS
@@
-9,7
+9,8
@@
mel mel-q mel-u mel-g
eword-decode eword-encode
mime mime-parse mmgeneric mmbuffer mmcooked
mel mel-q mel-u mel-g
eword-decode eword-encode
mime mime-parse mmgeneric mmbuffer mmcooked
- mailcap))
+ mailcap
+ smtp smtpmail))
(unless (and (fboundp 'base64-encode-string)
(subrp (symbol-function 'base64-encode-string)))
(unless (and (fboundp 'base64-encode-string)
(subrp (symbol-function 'base64-encode-string)))
@@
-19,11
+20,8
@@
(setq flim-modules (cons 'mel-b-el 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-b-ccl (cons 'mel-q-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
;;; FLIM-ELS ends here